From ecd69d23e821f79467a97e49eb8538160491df0a Mon Sep 17 00:00:00 2001 From: Konano Date: Tue, 5 Dec 2023 03:03:10 +0800 Subject: [PATCH] move configure_nodejs to init_priv --- init_priv.sh | 15 +++++++++++++++ init_user.sh | 17 +---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/init_priv.sh b/init_priv.sh index b6a338a..def4237 100755 --- a/init_priv.sh +++ b/init_priv.sh @@ -259,6 +259,21 @@ configure_proxychains() { fi } +configure_nodejs() { + [ -f /usr/local/bin/node ] && return + + if confirm_action "要安装 nodejs 吗?" "Y"; then + local version="v20.10.0" + local tarname="node-$version-linux-x64" + wget https://nodejs.org/dist/$version/$tarname.tar.xz -O $tempdir/$tarname.tar.xz + tar -xf $tempdir/$tarname.tar.xz -C $tempdir + sudo cp $tempdir/$tarname/bin/node /usr/local/bin/node + sudo cp $tempdir/$tarname/bin/npm /usr/local/bin/npm + rm $tempdir/$tarname.tar.xz + rm $tempdir/$tarname -r + fi +} + # ============================================================ configure_swap() { diff --git a/init_user.sh b/init_user.sh index 9766bd5..0adb69f 100755 --- a/init_user.sh +++ b/init_user.sh @@ -50,21 +50,6 @@ configure_miniconda() { fi } -configure_nodejs() { - [ -f /usr/local/bin/node ] && return - - if confirm_action "要安装 nodejs 吗?" "Y"; then - local version="v20.10.0" - local tarname="node-$version-linux-x64" - wget https://nodejs.org/dist/$version/$tarname.tar.xz -O $tempdir/$tarname.tar.xz - tar -xf $tempdir/$tarname.tar.xz -C $tempdir - mv $tempdir/$tarname/bin/node /usr/local/bin/node - mv $tempdir/$tarname/bin/npm /usr/local/bin/npm - rm $tempdir/$tarname.tar.xz - rm $tempdir/$tarname -r - fi -} - configure_nvm() { [ -d ~/.nvm/.git ] && return @@ -94,4 +79,4 @@ configure_ssh configure_ssh_keygen configure_git configure_miniconda -configure_nodejs +configure_nvm