diff options
author | Stephane Peter <megastep@megastep.org> | 2021-06-22 15:48:17 -0700 |
---|---|---|
committer | Stephane Peter <megastep@megastep.org> | 2021-06-22 15:48:17 -0700 |
commit | 8e93fb3092d2fa49360aa2a39952804730b2db70 (patch) | |
tree | c8fdb513d1160e19486569652d6df52a8fe496ca | |
parent | dd8366f0299c40c094da3f5cb3bcdc6b014a0ee6 (diff) | |
download | makeself-8e93fb3092d2fa49360aa2a39952804730b2db70.tar.gz |
Added --tar-format option (default is ustar)
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | makeself.1 | 2 | ||||
-rw-r--r-- | makeself.lsm | 2 | ||||
-rwxr-xr-x | makeself.sh | 15 |
4 files changed, 14 insertions, 7 deletions
@@ -1 +1 @@ -2.4.4 +2.4.5 @@ -1,4 +1,4 @@ -.TH "MAKESELF" "1" "2.4.4" +.TH "MAKESELF" "1" "2.4.5" .SH "NAME" makeself \- An utility to generate self-extractable archives. .SH "SYNTAX" diff --git a/makeself.lsm b/makeself.lsm index 40fc932..3c4cea8 100644 --- a/makeself.lsm +++ b/makeself.lsm @@ -1,6 +1,6 @@ Begin3 Title: makeself.sh -Version: 2.4.4 +Version: 2.4.5 Description: makeself.sh is a shell script that generates a self-extractable tar.gz archive from a directory. The resulting file appears as a shell script, and can be launched as is. The archive will then uncompress diff --git a/makeself.sh b/makeself.sh index f2d710d..c8ea565 100755 --- a/makeself.sh +++ b/makeself.sh @@ -71,6 +71,7 @@ # - 2.4.2 : Add support for threads for several compressors. (M. Limber) # Added zstd support. # - 2.4.3 : Make explicit POSIX tar archives for increased compatibility. +# - 2.4.5 : Added --tar-format to override ustar tar archive format # # (C) 1998-2021 by Stephane Peter <megastep@megastep.org> # @@ -79,7 +80,7 @@ # Self-extracting archives created with this script are explictly NOT released under the term of the GPL # -MS_VERSION=2.4.4 +MS_VERSION=2.4.5 MS_COMMAND="$0" unset CDPATH @@ -146,6 +147,7 @@ MS_Usage() echo " --nooverwrite : Do not extract the archive if the specified target directory exists" echo " --current : Files will be extracted to the current directory" echo " Both --current and --target imply --notemp" + echo " --tar-format opt : Specify a tar archive format (default is ustar)" echo " --tar-extra opt : Append more options to the tar command line" echo " --untar-extra opt : Append more options to the during the extraction of the tar archive" echo " --nomd5 : Don't calculate an MD5 for archive" @@ -202,6 +204,7 @@ NOPROGRESS=n COPY=none NEED_ROOT=n TAR_ARGS=rvf +TAR_FORMAT=ustar TAR_EXTRA="" GPG_EXTRA="" DU_ARGS=-ks @@ -327,9 +330,13 @@ do KEEP=y shift ;; + --tar-format) + TAR_FORMAT="$2" + shift 2 || { MS_Usage; exit 1; } + ;; --tar-extra) - TAR_EXTRA="$2" - shift 2 || { MS_Usage; exit 1; } + TAR_EXTRA="$2" + shift 2 || { MS_Usage; exit 1; } ;; --untar-extra) UNTAR_EXTRA="$2" @@ -671,7 +678,7 @@ tmparch="${TMPDIR:-/tmp}/mkself$$.tar" \) -print \ | LC_ALL=C sort \ | sed 's/./\\&/g' \ - | xargs $TAR $TAR_EXTRA --format ustar -$TAR_ARGS "$tmparch" + | xargs $TAR $TAR_EXTRA --format $TAR_FORMAT -$TAR_ARGS "$tmparch" ) || { echo "ERROR: failed to create temporary archive: $tmparch" rm -f "$tmparch" "$tmpfile" |