diff --git a/git-pull-all.sh b/git-pull-all.sh index 9a3b06a..1ab9940 100755 --- a/git-pull-all.sh +++ b/git-pull-all.sh @@ -4,10 +4,20 @@ if [ $1 ] then FONPATH=$1 else - read -p "Enter faronear path to git pull (leave blank for default ../..) >> " FONPATH + read -p "Enter faronear path to git pull (leave blank for default /faronear or ~/faronear or ../..) >> " FONPATH if [ ! $FONPATH ] then - FONPATH=../.. + if [ -d /faronear ] + then + FONPATH=/faronear + else + if [ -d ~/faronear ] + then + FONPATH=~/faronear + else + FONPATH=../.. + fi + fi fi fi diff --git a/npm-boot-all.sh b/npm-boot-all.sh index 904f346..e014e3f 100755 --- a/npm-boot-all.sh +++ b/npm-boot-all.sh @@ -4,10 +4,20 @@ if [ $1 ] then FONPATH=$1 else - read -p "Enter faronear path to npm boot (leave blank for default ../..) >> " FONPATH + read -p "Enter faronear path to git pull (leave blank for default /faronear or ~/faronear or ../..) >> " FONPATH if [ ! $FONPATH ] then - FONPATH=../.. + if [ -d /faronear ] + then + FONPATH=/faronear + else + if [ -d ~/faronear ] + then + FONPATH=~/faronear + else + FONPATH=../.. + fi + fi fi fi diff --git a/ssh-expect.sh b/ssh-expect.sh index b81587d..38d7fcf 100755 --- a/ssh-expect.sh +++ b/ssh-expect.sh @@ -1,6 +1,6 @@ #!/usr/bin/expect -## Usage: expect this.sh [hostname] [port] [username] [password] +# Usage: expect this.sh [hostname] [port] [username] [password] set timeout 30 spawn ssh -p [lindex $argv 1] [lindex $argv 2]@[lindex $argv 0] @@ -9,7 +9,7 @@ expect { {send "yes\n";exp_continue} "password:" {send "[lindex $argv 3]\n";exp_continue} - ":~]" + ":~" {send "su\n";exp_continue} "Password:" # {send "[lindex $argv 3]\ncd /faronear\n"}