diff --git a/Makefile b/Makefile index 5f70f28..d1da515 100644 --- a/Makefile +++ b/Makefile @@ -6,3 +6,12 @@ deploy: build build: scripts/shcompile src/main.sh > zpkg && chmod +x zpkg +# minimized build with lxsh +var_exclude = TMPDIR ZPKG_.* _ZPKG_.* SSH_ADDRESS HTTP_ADDRESS PKG_PATH COMPRESSION ALLOW_ROOT UPDATE_REMOVE +minimal: minimal-deploy + +minimal-deploy: minimal-build + scripts/server_deploy.sh + +minimal-build: + lxsh -o zpkg -m --minimize-var --exclude-var "$(var_exclude)" --minimize-fct --remove-unused src/main.sh diff --git a/src/deploy.sh b/src/deploy.sh index 2d0c76c..8f8c534 100644 --- a/src/deploy.sh +++ b/src/deploy.sh @@ -16,7 +16,7 @@ package() src="$tmpdir" fi ( - cd "$src" + cd "$src" || exit $? unset list [ -f DEPS ] && list=DEPS [ -f DESC ] && list="$list DESC" @@ -43,7 +43,7 @@ deploy_folder() { if [ -f "$1" ] && echo "$1" | grep -q '\.tar\.'"$extension\$" # file and valid extension then - cat "$1" | $pcompress -dc 2>/dev/null | tar -tf - >/dev/null 2>&1|| { echo "File '$1' is not a valid archive" && return 1; } + $pcompress -dc 2>/dev/null < "$1" | tar -tf - >/dev/null 2>&1|| { echo "File '$1' is not a valid archive" && return 1; } deploy_package "$1" "$1" || return $? elif [ -d "$1" ] # folder then diff --git a/src/install.sh b/src/install.sh index 9996380..c39f3d2 100644 --- a/src/install.sh +++ b/src/install.sh @@ -4,13 +4,14 @@ unpack() { echo "Unpacking $1" - cat "$1" | $pcompress -dc 2>/dev/null | tar -xf - + $pcompress -dc < "$1" 2>/dev/null | tar -xf - } # $1 = package , $2 = prefix add_package_entry() { ( + set -e cd "$PKG_PATH" if grep -q "^$1 " installed 2>/dev/null then