Install script no longer depends on git to be installed.

Also fixed a bug where a literal "\n" would be injected into the bash profile.
master
Ron Korving 2013-06-14 13:00:52 +09:00
parent 5c6af59fcd
commit 5a4c097aac
1 changed files with 11 additions and 6 deletions

View File

@ -1,16 +1,21 @@
#!/bin/bash #!/bin/bash
# an alternative URL that could be used: https://github.com/creationix/nvm/tarball/master
TARBALL_URL="https://api.github.com/repos/creationix/nvm/tarball"
NVM_TARGET="$HOME/.nvm" NVM_TARGET="$HOME/.nvm"
if [ -d "$NVM_TARGET" ]; then if [ -d "$NVM_TARGET" ]; then
echo "=> NVM is already installed in $NVM_TARGET, trying to update" echo "=> NVM is already installed in $NVM_TARGET, trying to update"
echo -ne "\r=> " rm -rf "$NVM_TARGET"
cd $NVM_TARGET && git pull
exit
fi fi
# Cloning to $NVM_TARGET # Downloading to $NVM_TARGET
git clone https://github.com/creationix/nvm.git $NVM_TARGET mkdir "$NVM_TARGET"
pushd "$NVM_TARGET" > /dev/null
echo -ne "=> "
curl --silent -L "$TARBALL_URL" | tar -xz --strip-components=1 || exit 1
echo -n Downloaded
popd > /dev/null
echo echo
@ -43,7 +48,7 @@ fi
if ! grep -qc 'nvm.sh' $PROFILE; then if ! grep -qc 'nvm.sh' $PROFILE; then
echo "=> Appending source string to $PROFILE" echo "=> Appending source string to $PROFILE"
echo "\n" >> "$PROFILE" echo "" >> "$PROFILE"
echo $SOURCE_STR >> "$PROFILE" echo $SOURCE_STR >> "$PROFILE"
else else
echo "=> Source string already in $PROFILE" echo "=> Source string already in $PROFILE"