diff --git a/dots/bash/.bashrc b/dots/bash/.bashrc index b29700b..d91dc45 100644 --- a/dots/bash/.bashrc +++ b/dots/bash/.bashrc @@ -81,12 +81,12 @@ PS1='\n⚙[\D{%y%m%d%H%M}|\u@\h|\w]\$ ' # change the window title of x terminals case ${TERM} in - xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"' - ;; - screen*) - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"' - ;; + xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) + PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"' + ;; + screen*) + PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"' + ;; esac @@ -182,7 +182,7 @@ nas() { echo "'/mnt/nas' and/or '/mnt/nas-fam' exist, but is not a directory" 1>&2 fi - if [[ -n $1 ]] ; then + if [[ -n $1 ]] ; then if [[ $1 == "umount" ]] || [[ $1 == "unmount" ]] ; then echo "umount /mnt/nas & /mnt/nas-fam" sudo umount -l /mnt/nas @@ -444,154 +444,154 @@ fif() { # ajp related # --- # ajp-cp2dropbox() { -# "/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2106_ajpDropboxDeployer/archi.sh" "$1" "$2" +# "/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2106_ajpDropboxDeployer/archi.sh" "$1" "$2" # } podigy() { cd /home/poq/syncDir/repos/git/gi.op.fo/podigy/src - source venv/bin/activate - python archi.py -s /home/poq/syncDir/repos/git/gi.op.fo/fiodb/db/podigy/sites + source venv/bin/activate + python archi.py -s /home/poq/syncDir/repos/git/gi.op.fo/fiodb/db/podigy/sites deactivate } # podigy-pywsdb() { -# podigy -# /home/poq/syncDir/repos/git/gi.op.fo/pyws/deploy/deployToBuildServer.sh db +# podigy +# /home/poq/syncDir/repos/git/gi.op.fo/pyws/deploy/deployToBuildServer.sh db # } # jeton # --- jeton() { - cd /home/poq/syncDir/repos/git/gi.op.fo/jeton/src/ - source venv/bin/activate - python archi.py -s /home/poq/syncDir/repos/git/gi.op.fo/fiodb/db/jeton/in/sites -r $1 - deactivate + cd /home/poq/syncDir/repos/git/gi.op.fo/jeton/src/ + source venv/bin/activate + python archi.py -s /home/poq/syncDir/repos/git/gi.op.fo/fiodb/db/jeton/in/sites -r $1 + deactivate } # misc websites # --- -alias 00101111.xyz-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/00101111.xyz/www/ usr@178.156.192.201:/var/www/00101111.xyz/" -alias factor.red-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/mini-websites/factor.red/ usr@178.156.192.201:/var/www/factor.red/" -alias op.fo-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/mini-websites/op.fo/ usr@178.156.192.201:/var/www/op.fo/" -alias wa.fo-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/mini-websites/wa.fo/ usr@178.156.192.201:/var/www/wa.fo/" +alias 00101111.xyz-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/00101111.xyz/www/ usr@weba:/var/www/00101111.xyz/" +alias factor.red-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/mini-websites/factor.red/ usr@weba:/var/www/factor.red/" +alias op.fo-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/mini-websites/op.fo/ usr@weba:/var/www/op.fo/" +alias wa.fo-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/mini-websites/wa.fo/ usr@weba:/var/www/wa.fo/" # jongleur # --- jcssbuilder() { - cd /home/poq/syncDir/repos/git/gi.op.fo/jCssBuilder/src - source venv/bin/activate - python /home/poq/syncDir/repos/git/gi.op.fo/jCssBuilder/src/archi.py - deactivate + cd /home/poq/syncDir/repos/git/gi.op.fo/jCssBuilder/src + source venv/bin/activate + python /home/poq/syncDir/repos/git/gi.op.fo/jCssBuilder/src/archi.py + deactivate } jongleur-activate() { - cd /home/poq/syncDir/repos/git/gitlab.com/jongleur/src - source venv/bin/activate + cd /home/poq/syncDir/repos/git/gitlab.com/jongleur/src + source venv/bin/activate } jump-to-downloads() { cd /home/poq/syncDir/0_downloads } ajp.fm-build() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/ajp.fm/jongleur/run.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/ajp.fm/jongleur/run.sh + deactivate jump-to-downloads } ajp.fm-build-all() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/ajp.fm/jongleur/runAll.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/ajp.fm/jongleur/runAll.sh + deactivate jump-to-downloads } alias ajp.fm-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/ajp.fm/jongleur/html_export/ usr@178.156.192.201:/var/www/ajp.fm/jongleur/" antijanteboka.com-build() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/antijanteboka.com/jongleur/run.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/antijanteboka.com/jongleur/run.sh + deactivate jump-to-downloads } antijanteboka.com-build-all() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/antijanteboka.com/jongleur/runAll.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/antijanteboka.com/jongleur/runAll.sh + deactivate jump-to-downloads } alias antijanteboka.com-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/antijanteboka.com/jongleur/html_export/ usr@178.156.192.201:/var/www/antijanteboka.com/jongleur/" antijantemiriam.com-build() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/antijantemiriam.com/jongleur/run.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/antijantemiriam.com/jongleur/run.sh + deactivate jump-to-downloads } antijantemiriam.com-build-all() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/antijantemiriam.com/jongleur/runAll.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/antijantemiriam.com/jongleur/runAll.sh + deactivate jump-to-downloads } alias antijantemiriam.com-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/antijantemiriam.com/jongleur/html_export/ usr@178.156.192.201:/var/www/antijantemiriam.com/jongleur/" billgoats.com-build() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/billgoats.com/jongleur/run.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/billgoats.com/jongleur/run.sh + deactivate jump-to-downloads } billgoats.com-build-all() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/billgoats.com/jongleur/runAll.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/billgoats.com/jongleur/runAll.sh + deactivate jump-to-downloads } alias billgoats.com-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/billgoats.com/jongleur/html_export/ usr@178.156.192.201:/var/www/billgoats.com/jongleur/" curious.art-build() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/curious.art/jongleur/run.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/curious.art/jongleur/run.sh + deactivate jump-to-downloads } curious.art-build-all() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/curious.art/jongleur/runAll.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/curious.art/jongleur/runAll.sh + deactivate jump-to-downloads } alias curious.art-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/curious.art/jongleur/html_export/ usr@178.156.192.201:/var/www/curious.art/jongleur/" curiouscreators.com-build() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/curiouscreators.com/jongleur/run.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/curiouscreators.com/jongleur/run.sh + deactivate jump-to-downloads } curiouscreators.com-build-all() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/curiouscreators.com/jongleur/runAll.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/curiouscreators.com/jongleur/runAll.sh + deactivate jump-to-downloads } alias curiouscreators.com-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/curiouscreators.com/jongleur/html_export/ usr@178.156.192.201:/var/www/curiouscreators.com/jongleur/" frodr.com-build() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/frodr.com/jongleur/run.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/frodr.com/jongleur/run.sh + deactivate jump-to-downloads } frodr.com-build-all() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/frodr.com/jongleur/runAll.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/frodr.com/jongleur/runAll.sh + deactivate jump-to-downloads } alias frodr.com-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/frodr.com/jongleur/html_export/ usr@178.156.192.201:/var/www/frodr.com/jongleur/" klevstul.com-build() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/klevstul.com/jongleur/run.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/klevstul.com/jongleur/run.sh + deactivate jump-to-downloads } klevstul.com-build-all() { - jongleur-activate - /home/poq/syncDir/repos/git/gi.op.fo/klevstul.com/jongleur/runAll.sh - deactivate + jongleur-activate + /home/poq/syncDir/repos/git/gi.op.fo/klevstul.com/jongleur/runAll.sh + deactivate jump-to-downloads } alias klevstul.com-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/repos/git/gi.op.fo/klevstul.com/jongleur/html_export/ usr@weba:/var/www/klevstul.com/jongleur/"