From e806b7c932dc149c55cd330d0c99fd8195f31267 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Wed, 20 Mar 2024 22:40:37 +0100 Subject: [PATCH] Switch from `nvs` to `n` --- scripts/Common/Config/NVS/install.sh | 20 -------------------- scripts/Common/Software/NVS/install.sh | 11 ----------- scripts/Common/Software/n/install.sh | 8 ++++++++ scripts/PopOS/Collections/personal.sh | 2 +- 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100755 scripts/Common/Config/NVS/install.sh delete mode 100755 scripts/Common/Software/NVS/install.sh create mode 100755 scripts/Common/Software/n/install.sh diff --git a/scripts/Common/Config/NVS/install.sh b/scripts/Common/Config/NVS/install.sh deleted file mode 100755 index 98fccf2c..00000000 --- a/scripts/Common/Config/NVS/install.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -NVS_HOME="${NVS_HOME:-'$HOME/.nvs'}"; -NVS_PATH="${NVS_PATH}"; - -bashProfile="/etc/bash.bashrc"; - -for profile in "$bashProfile" "/etc/fish/conf.d/nvs.fish" "/etc/zsh/zprofile" -do - if ! grep "\bNVS_HOME\b" "$profile" - then - { - echo "export NVS_HOME=\"$NVS_HOME\""; - echo 'source "'"$NVS_PATH"'/nvs.sh"'; - } | sudo tee -a "$profile"; - fi; -done; - -source "$bashProfile"; -nvs add latest; -nvs link latest; diff --git a/scripts/Common/Software/NVS/install.sh b/scripts/Common/Software/NVS/install.sh deleted file mode 100755 index faa798fc..00000000 --- a/scripts/Common/Software/NVS/install.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -pushd "${BASH_SOURCE%/*}" > /dev/null; -home_expression='$HOME/.nvs'; -export NVS_HOME="$(bash -c echo $home_expression)"; -git clone https://github.com/jasongin/nvs "$NVS_HOME"; - -NVS_HOME="$home_expression" \ -NVS_PATH="$NVS_HOME" \ - . "../../Config/NVS/install.sh"; - -popd > /dev/null; diff --git a/scripts/Common/Software/n/install.sh b/scripts/Common/Software/n/install.sh new file mode 100755 index 00000000..ad01f2ff --- /dev/null +++ b/scripts/Common/Software/n/install.sh @@ -0,0 +1,8 @@ +#!/bin/bash +if [ ! "$UID" -eq 0 ] +then + sudo bash "$BASH_SOURCE"; +else + npm install -g n; + n install latest; +fi; diff --git a/scripts/PopOS/Collections/personal.sh b/scripts/PopOS/Collections/personal.sh index 1d17ba3f..1afeea01 100755 --- a/scripts/PopOS/Collections/personal.sh +++ b/scripts/PopOS/Collections/personal.sh @@ -21,7 +21,7 @@ source "../../Debian/Software/git/install.sh"; source "../../Debian/Software/logo-ls/install.sh"; source "../../Debian/Software/VSCodium/install.sh"; source "../../Debian/Software/Visual Studio Code/install.sh"; -source "../../Common/Software/NVS/install.sh"; +source "../../Common/Software/n/install.sh"; source "../../Debian/Software/Python/install.sh"; source "../../Common/Software/pyenv/install.sh"; source "../../Common/Software/pipenv/install.sh";