diff --git a/build_remote.sh b/build_remote.sh
old mode 100644
new mode 100755
diff --git a/build_standalone.sh b/build_standalone.sh
index 67c1d08..d1e7336 100755
--- a/build_standalone.sh
+++ b/build_standalone.sh
@@ -5,8 +5,15 @@ set -e
 set -o pipefail
 
 cd $(dirname $0)
-source "$HOME/.bash_profile"
-export GOPATH=$GOPATH:/home/pi/build_tmp 
+
+if test $(whoami) = "pi"
+then
+    export GOPATH=/home/pi/build_tmp 
+	export GOROOT=$HOME/go
+	export PATH=$PATH:$GOROOT/bin
+fi
+#[[ -f $HOME/.bash_profile ]] && source "$HOME/.bash_profile"
+#[[ -f $HOME/.bashrc ]] && source "$HOME/.bashrc"
 
 go generate
 exec go build -tags vfs "$@"