Browse Source

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 years ago
parent
commit
cde251189c
2 changed files with 6 additions and 2 deletions
  1. 4
    2
      installer/linux/installerstub.sh
  2. 2
    0
      installer/linux/makeInstallerLinux.sh

+ 4
- 2
installer/linux/installerstub.sh View File

@@ -219,8 +219,8 @@ uncompress() {
219 219
 	fi;
220 220
 	echo "Decompressing: ${FILE}"
221 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 224
 	if [ "${OUTPUT}" = "" ]; then
225 225
 		echo "Decompression failed."
226 226
 		errordialog "DMDirc Setup" "Decompression failed.\nThis shouldn't happen, please raise a bug report at http://bugs.dmdirc.com${DEBUGINFO}";
@@ -284,8 +284,10 @@ getMD5() {
284 284
 	if [ "${MD5BIN}" != "" ]; then
285 285
 		echo "test" | ${MD5BIN} -
286 286
 		if [ $? -eq 0 ]; then
287
+			echo "Linux-Style MD5SUM: ${MD5BIN}"
287 288
 			getMD5Linux $@
288 289
 		else
290
+			echo "BSD-Style MD5SUM: ${MD5BIN}"
289 291
 			getMD5BSD $@
290 292
 		fi;
291 293
 	fi;

+ 2
- 0
installer/linux/makeInstallerLinux.sh View File

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

Loading…
Cancel
Save