diff options
| author | realtime-neil <neil@rtr.ai> | 2022-10-27 19:48:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 12:48:47 -0700 |
| commit | f0658cc19f2268f93b255607605fad18d55b74d3 (patch) | |
| tree | 9a0f4c46d8080aed30d77a7d71d5001b57ae6fb0 | |
| parent | 1d258e5b20010baa0d704824fb2b49b684d9383b (diff) | |
| download | makeself-f0658cc19f2268f93b255607605fad18d55b74d3.tar.gz | |
fix #282 redux: ESXi workaround: 'tr' -> 'sed' (#286)
ESXi v6.5 ships without 'tr'. Within 'makeself-header.sh', replace every
instance of
tr -d " "
with
sed "s/ //g"
| -rwxr-xr-x | makeself-header.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/makeself-header.sh b/makeself-header.sh index 8ba4389..7462cf5 100755 --- a/makeself-header.sh +++ b/makeself-header.sh @@ -200,7 +200,7 @@ MS_Verify_Sig() MKTEMP_PATH=\`exec <&- 2>&-; which mktemp || command -v mktemp || type mktemp\` test -x "\$GPG_PATH" || GPG_PATH=\`exec <&- 2>&-; which gpg || command -v gpg || type gpg\` test -x "\$MKTEMP_PATH" || MKTEMP_PATH=\`exec <&- 2>&-; which mktemp || command -v mktemp || type mktemp\` - offset=\`head -n "\$skip" "\$1" | wc -c | tr -d " "\` + offset=\`head -n "\$skip" "\$1" | wc -c | sed "s/ //g"\` temp_sig=\`mktemp -t XXXXX\` echo \$SIGNATURE | base64 --decode > "\$temp_sig" gpg_output=\`MS_dd "\$1" \$offset \$totalsize | LC_ALL=C "\$GPG_PATH" --verify "\$temp_sig" - 2>&1\` @@ -235,8 +235,8 @@ MS_Check() if test x"\$quiet" = xn; then MS_Printf "Verifying archive integrity..." fi - offset=\`head -n "\$skip" "\$1" | wc -c | tr -d " "\` - fsize=\`cat "\$1" | wc -c | tr -d " "\` + offset=\`head -n "\$skip" "\$1" | wc -c | sed "s/ //g"\` + fsize=\`cat "\$1" | wc -c | sed "s/ //g"\` if test \$totalsize -ne \`expr \$fsize - \$offset\`; then echo " Unexpected archive size." >&2 exit 2 @@ -424,7 +424,7 @@ EOLSM ;; --list) echo Target directory: \$targetdir - offset=\`head -n "\$skip" "\$0" | wc -c | tr -d " "\` + offset=\`head -n "\$skip" "\$0" | wc -c | sed "s/ //g"\` for s in \$filesizes do MS_dd "\$0" \$offset \$s | MS_Decompress | UnTAR t @@ -433,7 +433,7 @@ EOLSM exit 0 ;; --tar) - offset=\`head -n "\$skip" "\$0" | wc -c | tr -d " "\` + offset=\`head -n "\$skip" "\$0" | wc -c | sed "s/ //g"\` arg1="\$2" shift 2 || { MS_Help; exit 1; } for s in \$filesizes @@ -617,7 +617,7 @@ location="\`pwd\`" if test x"\$SETUP_NOCHECK" != x1; then MS_Check "\$0" fi -offset=\`head -n "\$skip" "\$0" | wc -c | tr -d " "\` +offset=\`head -n "\$skip" "\$0" | wc -c | sed "s/ //g"\` if test x"\$verbose" = xy; then MS_Printf "About to extract $USIZE KB in \$tmpdir ... Proceed ? [Y/n] " |