diff --git a/setup.sh b/setup.sh
index b62949f..5db8daa 100755
--- a/setup.sh
+++ b/setup.sh
@@ -91,13 +91,13 @@ if [[ ! -d "$env_shared_dir" ]]; then
 		export BRANCH="dev"
 	fi
 	git clone https://git.hyperling.com/me/env-shared \
-		--branch=$BRANCH ~/$env_shared_dir
-	cp -v ~/$env_shared_dir/rc_shared.sh ~/.rc_shared
-	cp -v ~/$env_shared_dir/vimrc.vim ~/.vimrc
+		--branch=$BRANCH "$env_shared_dir"
+	cp -v "$env_shared_dir"/rc_shared.sh ~/.rc_shared
+	cp -v "$env_shared_dir"/vimrc.vim ~/.vimrc
 	if [[ ! -d ~/bin ]]; then
 		mkdir -pv ~/bin
 	fi
-	cp -v ~/$env_shared_dir/bin-shared/* ~/bin/
+	cp -v "$env_shared_dir"/bin-shared/* ~/bin/
 else
 	echo -e "`date` - Already installed, updating."
 	update-shared