diff --git a/ipfs-install.sh b/ipfs-install.sh index a5f5aae..e6c3605 100755 --- a/ipfs-install.sh +++ b/ipfs-install.sh @@ -13,8 +13,8 @@ else fi fi -curl https://dist.ipfs.tech/kubo/v$VERSION/kubo_$VERSION_linux-amd64.tar.gz -o kubo.tgz -tar xzf kubo.tgz +curl https://dist.ipfs.tech/kubo/v$VERSION/kubo_v$VERSION_linux-amd64.tar.gz -o kubo_v$VERSION.tgz +tar xzf kubo_v$VERSION.tgz ## install ./kubo/ipfs to /usr/local/bin/ipfs cd kubo && sudo bash install.sh diff --git a/nixhome/.bashrc b/nixhome/.bashrc index 08c9694..12c0713 100644 --- a/nixhome/.bashrc +++ b/nixhome/.bashrc @@ -90,6 +90,7 @@ esac # nvm settings if [ -d $HOME/.nvm ] then + # 注意,这句 export 导致 `su` 会继承原用户的环境变量 NVM_DIR=/home/原用户/.nvm,可能导致不符合预期的行为。因此要 `su -` 更安全。 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 diff --git a/nvm-install.sh b/nvm-install.sh index 3ee90e6..673e49a 100755 --- a/nvm-install.sh +++ b/nvm-install.sh @@ -1,6 +1,17 @@ -curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash +# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash +# pushd /faronear/fon/sysconfig +# # 取消被默认添加到 .bashrc 的设置,already integrated in .bashrc +# git reset . && git checkout . +# popd -pushd /faronear/fon/sysconfig -# 取消被默认添加到 .bashrc 的设置,already integrated in .bashrc -git reset . && git checkout . -popd +# 注意,这个安装脚本先会查看 NVM_DIR。如果是从其他用户 `su` 过来的,继承了这个变量 NVM_DIR=/home/原用户/.nvm,导致无法安装在当前 root 用户下。 +# 因此要么 `su -` 要么不使用安装脚本,而是直接执行脚本里的真正安装动作,即 git clone + +git clone https://github.com/nvm-sh/nvm.git ~/.nvm + +echo Add these lines to your launch script such as .bashrc : +echo '########################################################################' +echo 'export NVM_DIR="$HOME/.nvm"' +echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' +echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"' +echo '########################################################################'