diff --git a/install.sh b/install.sh index 571056c..02f6e3f 100755 --- a/install.sh +++ b/install.sh @@ -35,7 +35,7 @@ if ! checkCommands "${array[@]}"; then echo "Installing now (sudo permissions required)..." command -v apt &>/dev/null && sudo apt install -y automake git zip wget # debian, ubuntu command -v dnf &>/dev/null && sudo dnf install -y automake git zip wget # rhel, fedora, centos - command -v apk &>/dev/null && sudo apk add automake git zip wget # alpine + command -v apk &>/dev/null && sudo apk add automake git zip wget # alpine sleep 2 fi @@ -73,11 +73,13 @@ if ! command -v nvm &>/dev/null; then [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion - nvm install --lts + nvm install lts/gallium npm install -g npm@latest sleep 2 else - nvm use --lts + nvm install lts/gallium + npm install -g npm@latest + nvm use lts/gallium fi if ! command -v nyuu &>/dev/null; then diff --git a/pack.sh b/pack.sh index cc83788..bad4323 100755 --- a/pack.sh +++ b/pack.sh @@ -60,10 +60,10 @@ fi export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion -nvm use --lts +nvm use lts/gallium -if (($RANDOM_LENGTH_FILE < 6)); then - echo "Random length should be > 6, change it in the config.env file." +if (($LENGTH_FILE < 6)) || (($LENGTH_PASSWORD < 6)); then + echo "Random length for filename or password should be > 6, change it in the config.env file." exit 1 fi