diff options
| author | Alex Tokarev <nohuhu@users.noreply.github.com> | 2018-04-09 21:35:27 -0700 |
|---|---|---|
| committer | Stéphane Peter <megastep@megastep.org> | 2018-04-09 21:35:27 -0700 |
| commit | d3232ec6e1b02bea6792b19de1f4b5d7be217d9f (patch) | |
| tree | 8e2ded8dbdd508e8c2b69fed340ca592bdad6480 /makeself-header.sh | |
| parent | 9ffe633bb2c1e419d5c5e66489b6bcaffbf8b057 (diff) | |
| download | makeself-d3232ec6e1b02bea6792b19de1f4b5d7be217d9f.tar.gz | |
Openssl improvements (#129)
* Add support for alternate password source for openssl encryption
* OpenSSL decrypt works on Solaris 10 with default openssl install
Diffstat (limited to 'makeself-header.sh')
| -rwxr-xr-x | makeself-header.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/makeself-header.sh b/makeself-header.sh index e838778..4aeba75 100755 --- a/makeself-header.sh +++ b/makeself-header.sh @@ -41,6 +41,11 @@ if test -d /usr/xpg4/bin; then export PATH fi +if test -d /usr/sfw/bin; then + PATH=\$PATH:/usr/sfw/bin + export PATH +fi + unset CDPATH MS_Printf() @@ -479,6 +484,12 @@ fi if test x"\$quiet" = xn; then MS_Printf "Uncompressing \$label" + + # Decrypting with openssl will ask for password, + # the prompt needs to start on new line + if test x"$ENCRYPT" = xy; then + echo + fi fi res=3 if test x"\$keep" = xn; then |