Переглянути джерело

BSD tar outputs extracted file names to stderr not stdout (POSIX standard says to do it that way for some reason o.0)


git-svn-id: http://svn.dmdirc.com/trunk@4234 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Shane Mc Cormack 16 роки тому
джерело
коміт
cde251189c

+ 4
- 2
installer/linux/installerstub.sh Переглянути файл

219
 	fi;
219
 	fi;
220
 	echo "Decompressing: ${FILE}"
220
 	echo "Decompressing: ${FILE}"
221
 #	DEBUGINFO="${DEBUGINFO}\nFile: ${FILE}"
221
 #	DEBUGINFO="${DEBUGINFO}\nFile: ${FILE}"
222
-#	DEBUGINFO="${DEBUGINFO}\nCommand: tail ${TAILOPTS}${ENDLINE} "${FILE}" | gzip -cd | tar -xvf - 2>/dev/null"
223
-	OUTPUT=`tail ${TAILOPTS}${ENDLINE} "${FILE}" | gzip -cd | tar -xvf - 2>/dev/null`
222
+#	DEBUGINFO="${DEBUGINFO}\nCommand: tail ${TAILOPTS}${ENDLINE} "${FILE}" | gzip -cd | tar -xvf - 2>1"
223
+	OUTPUT=`tail ${TAILOPTS}${ENDLINE} "${FILE}" | gzip -cd | tar -xvf - 2>1`
224
 	if [ "${OUTPUT}" = "" ]; then
224
 	if [ "${OUTPUT}" = "" ]; then
225
 		echo "Decompression failed."
225
 		echo "Decompression failed."
226
 		errordialog "DMDirc Setup" "Decompression failed.\nThis shouldn't happen, please raise a bug report at http://bugs.dmdirc.com${DEBUGINFO}";
226
 		errordialog "DMDirc Setup" "Decompression failed.\nThis shouldn't happen, please raise a bug report at http://bugs.dmdirc.com${DEBUGINFO}";
284
 	if [ "${MD5BIN}" != "" ]; then
284
 	if [ "${MD5BIN}" != "" ]; then
285
 		echo "test" | ${MD5BIN} -
285
 		echo "test" | ${MD5BIN} -
286
 		if [ $? -eq 0 ]; then
286
 		if [ $? -eq 0 ]; then
287
+			echo "Linux-Style MD5SUM: ${MD5BIN}"
287
 			getMD5Linux $@
288
 			getMD5Linux $@
288
 		else
289
 		else
290
+			echo "BSD-Style MD5SUM: ${MD5BIN}"
289
 			getMD5BSD $@
291
 			getMD5BSD $@
290
 		fi;
292
 		fi;
291
 	fi;
293
 	fi;

+ 2
- 0
installer/linux/makeInstallerLinux.sh Переглянути файл

298
 	if [ "${MD5BIN}" != "" ]; then
298
 	if [ "${MD5BIN}" != "" ]; then
299
 		echo "test" | ${MD5BIN} -
299
 		echo "test" | ${MD5BIN} -
300
 		if [ $? -eq 0 ]; then
300
 		if [ $? -eq 0 ]; then
301
+			echo "Linux-Style MD5SUM: ${MD5BIN}"
301
 			getMD5Linux $@
302
 			getMD5Linux $@
302
 		else
303
 		else
304
+			echo "BSD-Style MD5SUM: ${MD5BIN}"
303
 			getMD5BSD $@
305
 			getMD5BSD $@
304
 		fi;
306
 		fi;
305
 	fi;
307
 	fi;

Завантаження…
Відмінити
Зберегти