From 5a4c097aac5a2b90072378cafa0a04be9c88185f Mon Sep 17 00:00:00 2001 From: Ron Korving Date: Fri, 14 Jun 2013 13:00:52 +0900 Subject: [PATCH] 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. --- install.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index ab8cca4..91c77ae 100755 --- a/install.sh +++ b/install.sh @@ -1,16 +1,21 @@ #!/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" if [ -d "$NVM_TARGET" ]; then echo "=> NVM is already installed in $NVM_TARGET, trying to update" - echo -ne "\r=> " - cd $NVM_TARGET && git pull - exit + rm -rf "$NVM_TARGET" fi -# Cloning to $NVM_TARGET -git clone https://github.com/creationix/nvm.git $NVM_TARGET +# Downloading to $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 @@ -43,7 +48,7 @@ fi if ! grep -qc 'nvm.sh' $PROFILE; then echo "=> Appending source string to $PROFILE" - echo "\n" >> "$PROFILE" + echo "" >> "$PROFILE" echo $SOURCE_STR >> "$PROFILE" else echo "=> Source string already in $PROFILE"