Skip to content

Implement optional substructure from hostname to machine_dir #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Ejler wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Implement optional substructure from hostname to machine_dir #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions bootstrap/bootstrap_linux.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,41 @@ export PATH=$PATH:$HOME/PyExpLabSys/bin:$HOME/.local/bin:$HOME/machines/bin
export PYTHONPATH=$PYTHONPATH:$HOME/PyExpLabSys:$HOME/machines
stty -ixon

machine_dir=$HOME/machines/$HOSTNAME
if [ -d $machine_dir ]; then
echo "Entering machine dir: $machine_dir"
cd $machine_dir
# Define and enter machine dir
prefix=${HOSTNAME%%-*} # everything before first -
rest=${HOSTNAME#*-} # remove prefix and first -
setup=${rest%%-*} # everything before next -
end=${rest#*-} # everything after the next -

if [ -d $HOME/machines/$HOSTNAME ]; then
machine_dir=$HOME/machines/$HOSTNAME
elif [ -d $HOME/machines/$prefix/$setup-$end ]; then
machine_dir=$HOME/machines/$prefix/$setup-$end
elif [ -d $HOME/machines/$prefix/$setup/$end ]; then
machine_dir=$HOME/machines/$prefix/$setup/$end
elif [ -d $HOME/machines/$setup/$end ]; then
machine_dir=$HOME/machines/$setup/$end
elif [ -d $HOME/machines/$setup-$end ]; then
machine_dir=$HOME/machines/$setup-$end
elif [ -d $HOME/machines/$prefix-$setup ]; then
machine_dir=$HOME/machines/$prefix-$setup
elif [ -d $HOME/machines/$prefix/$setup ]; then
machine_dir=$HOME/machines/$prefix/$setup
else
machine_dir=$HOME/machines
fi
echo "Entering machine dir: $machine_dir"
cd $machine_dir

# Run pistatus
pistatus.py
if [ -f ~/'$PELS_ENV'/bin/activate ]; then
source ~/'$PELS_ENV'/bin/activate
if [ -f ~/.pels/bin/activate ]; then
source ~/.pels/bin/activate
fi

# Reload aliases to exploit newly defined variable names
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi
'

Expand All @@ -56,7 +83,7 @@ alias emacs-nolint=\"emacs -q --load ~/PyExpLabSys/bootstrap/.emacs-simple\"
alias a=\"cd ~/PyExpLabSys/PyExpLabSys/apps\"
alias c=\"cd ~/PyExpLabSys/PyExpLabSys/common\"
alias d=\"cd ~/PyExpLabSys/PyExpLabSys/drivers\"
alias m=\"if [ -d ~/machines/\$HOSTNAME ];then cd ~/machines/\$HOSTNAME; else cd ~/machines; fi\"
alias m=\"if [ -d $machine_dir ];then cd $machine_dir; fi\"
alias p=\"cd ~/PyExpLabSys/PyExpLabSys\"
alias b=\"cd ~/PyExpLabSys/bootstrap\"
alias s=\"screen -x -p 0\"
Expand Down