updated to latest makeself
Costa Tsaousis (ktsaou) committed
Oct 1, 2017 at 20:31 UTC
d643340ae772094817b86d0ebab06d9cc7f1a6e4
2 files changed
+6
-7
makeself/makeself-header.sh
+2
-3
@@ -218,10 +218,9 @@ MS_Check()
218
UnTAR()
219
{
220
if test x"\$quiet" = xn; then
221
- tar \$1 "$UNTAR_EXTRA" -vf - 2>&1 || { echo Extraction failed. > /dev/tty; kill -15 \$$; }
221
+ tar \$1vf - $UNTAR_EXTRA 2>&1 || { echo " ... Extraction failed." > /dev/tty; kill -15 \$$; }
222
else
223
-
224
- tar \$1 "$UNTAR_EXTRA" -f - 2>&1 || { echo Extraction failed. > /dev/tty; kill -15 \$$; }
223
+ tar \$1f - $UNTAR_EXTRA 2>&1 || { echo Extraction failed. > /dev/tty; kill -15 \$$; }
224
fi
225
}
226
makeself/makeself.sh
+4
-4
@@ -470,8 +470,8 @@ gpg-asymmetric)
470
GUNZIP_CMD="gpg --yes -d"
471
;;
472
openssl)
473
- GZIP_CMD="openssl aes-256-cbc -a -salt"
474
- GUNZIP_CMD="openssl aes-256-cbc -d -a"
473
+ GZIP_CMD="openssl aes-256-cbc -a -salt -md sha256"
474
+ GUNZIP_CMD="openssl aes-256-cbc -d -a -md sha256"
475
;;
476
Unix)
477
GZIP_CMD="compress -cf"
@@ -529,7 +529,8 @@ if test "$QUIET" = "n";then
529
echo Adding files to archive named \"$archname\"...
530
fi
531
exec 3<> "$tmpfile"
532
-(cd "$archdir" && ( tar "$TAR_EXTRA" -$TAR_ARGS - . | eval "$GZIP_CMD" >&3 ) ) || { echo Aborting: Archive directory not found or temporary file: "$tmpfile" could not be created.; exec 3>&-; rm -f "$tmpfile"; exit 1; }
532
+( cd "$archdir" && ( tar $TAR_EXTRA -$TAR_ARGS - . | eval "$GZIP_CMD" >&3 ) ) || \
533
+ { echo Aborting: archive directory not found or temporary file: "$tmpfile" could not be created.; exec 3>&-; rm -f "$tmpfile"; exit 1; }
534
exec 3>&- # try to close the archive
535
536
fsize=`cat "$tmpfile" | wc -c | tr -d " "`
@@ -617,4 +618,3 @@ else
618
fi
619
fi
620
rm -f "$tmpfile"
620
-