diff --git a/init.sh b/init.sh index fa96917..42b7990 100755 --- a/init.sh +++ b/init.sh @@ -134,6 +134,7 @@ Architectures: $OS_ARCH if [ $DISTRO_PVE -eq 1 ]; then sed -i -E "s/.*zoxide.*//g" $HOME/.zshrc else + $SCRIPTPATH/install-release.sh -r zsh-users/zsh-completions -k tarball -o completions.tar.gz -d "0 src" -p /usr/local/share/zsh/site-functions $SCRIPTPATH/install-release.sh -r ajeetdsouza/zoxide -m x86_64-unknown -p /usr/local/bin -n zoxide -f fi } diff --git a/install-release.sh b/install-release.sh index c8f3582..be20f19 100755 --- a/install-release.sh +++ b/install-release.sh @@ -83,9 +83,6 @@ main(){ echo "$current_dir" cd "$current_dir" fi - elif (echo "$PKG_DIR"|grep -i "/") &>/dev/null; then - echo "$PKG_DIR" - cd "$PKG_DIR" else indices=($PKG_DIR) for index in ${indices[@]}; do @@ -93,17 +90,14 @@ main(){ dirs=$(ls -l|awk '/^d/ {print $NF}') arr_dirs=($dirs) current_dir=${arr_dirs[$index]} - if [ -d "$current_dir" ]; then - echo "$current_dir" - cd "$current_dir" - else - echo "Wrong dir inside package!" - popd >/dev/null - rm -rf "$tmp_dir" - exit 1 - fi else - echo "Wrong dir indices!" + current_dir=$index + fi + if [ -d "$current_dir" ]; then + echo "$current_dir" + cd "$current_dir" + else + echo "Wrong dir inside package!" popd >/dev/null rm -rf "$tmp_dir" exit 1 @@ -178,7 +172,11 @@ usage(){ echo " -n Program name"; echo " -f Copy program name file only (when -n is set)"; echo " -o Package name"; - echo " -d Dir inside package (set path ends with '/'; set numbers as indices; set '-' as packge name)"; + echo " -d Dir inside package:"; + echo " '-' as packge name without extension"; + echo " space separated stirng mixed with:"; + echo " number as index"; + echo " string as name"; echo " -e Expression for sed (only for '-d -')"; echo " -c Command for reload"; echo " -a Auth user[:pass]";