diff --git a/dots/bash/.bashrc b/dots/bash/.bashrc index 2a57562..6cb6c35 100644 --- a/dots/bash/.bashrc +++ b/dots/bash/.bashrc @@ -76,7 +76,7 @@ alias pgmodeler="/home/poq/syncDir/swas/portableApps/pgmodeler_plus-1*" # x terminal shell start string | https://askubuntu.com/questions/1340319/ps1-string-full-documentation-and-reference-page # https://bash-prompt-generator.org/ # https://askubuntu.com/questions/193416/adding-timestamps-to-terminal-prompts -PS1='\nāš™[\D{%y%m%d%H%M}|\u@\h|\w]\$ ' +PS1='\[āš™\][\D{%y%m%d%H%M}|\u@\h|\w]\$ ' #PS1='\[\e[01;32m\]\u@\h \[\e[01;34m\]\w\[\e[00m\]\$ ' # change the window title of x terminals @@ -136,12 +136,6 @@ zipr() { zip -r $1 . -x $1 } -#gpxImporter() { -# cd /home/poq/syncDir/repos/git/gi.op.fo/gpx-importer/go/src/ -# go run main.go -# cd - -#} - generate_password() { local length=30 local chars='A-Za-z0-9!@#$%^&*()_+[]{}|;:,.<>?' @@ -175,6 +169,25 @@ randoms() { echo "----------" } +quick_hours() { + local location=$1 + local balance=$2 + local worked=$3 + + local target=450 # 7:30 in minutes + + # parse worked HH:MM into minutes + local hours minutes worked_minutes + hours="${worked%%:*}" + minutes="${worked##*:}" + worked_minutes=$(( 10#$hours * 60 + 10#$minutes )) + + # calculate new balance + local new_balance=$(( balance + worked_minutes - target )) + + # format output + echo "[@${location} ${new_balance}]" +} # --- # mounting @@ -215,10 +228,6 @@ nas() { # multimedia # --- -#alias videoCompressor="/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2104_videoCompressor/src/vc_v2.sh" -#alias videoWatermark="/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2104_videoCompressor/src/vcwm_v1.sh" -#alias toJpg='/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2306_toJpg/toJpg.sh' - # https://itsfoss.com/compress-pdf-linux/ pdfCompress() { gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.5 -dPDFSETTINGS=/ebook \ @@ -416,19 +425,12 @@ fif() { # ajp related # --- -# ajp-cp2dropbox() { -# "/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 deactivate } -# podigy-pywsdb() { -# podigy -# /home/poq/syncDir/repos/git/gi.op.fo/pyws/deploy/deployToBuildServer.sh db -# } # jeton diff --git a/dots/bash/obsolete.bashrc b/dots/bash/obsolete.bashrc index 4b90d7c..b948c56 100644 --- a/dots/bash/obsolete.bashrc +++ b/dots/bash/obsolete.bashrc @@ -23,25 +23,25 @@ # # server syncs/backups/deploys # # --- # srv-guru-backup() { -# echo "[srv-guru-backup]: <=== download wc2sd/exec/" -# rsync -v -a --progress --stats --e 'ssh -p 1808' trunk@135.181.193.110:/home/trunk/wc2sd/exec/ /home/poq/syncDir/gitRepos/gi.op.fo/srv.guru/trunk/wc2sd/exec/ -# echo "[srv-guru-backup]: <=== download wc2sd/db/" -# rsync -v -a --progress --stats -e 'ssh -p 1808' trunk@135.181.193.110:/home/trunk/wc2sd/db/ /home/poq/syncDir/gitRepos/gi.op.fo/srv.guru/trunk/wc2sd/db/ -# echo "[srv-guru-backup]: <=== download cron_export/" -# rsync -v -a --progress --stats -e 'ssh -p 1808' trunk@135.181.193.110:/home/trunk/cron_export/ /home/poq/syncDir/gitRepos/gi.op.fo/srv.guru/trunk/cron_export/ -# echo "[srv-guru-backup]: <=== download .ssh/" -# rsync -v -a --progress --stats -e 'ssh -p 1808' trunk@135.181.193.110:/home/trunk/.ssh/ /home/poq/syncDir/gitRepos/gi.op.fo/srv.guru/trunk/.ssh/ +# echo "[srv-guru-backup]: <=== download wc2sd/exec/" +# rsync -v -a --progress --stats --e 'ssh -p 1808' trunk@135.181.193.110:/home/trunk/wc2sd/exec/ /home/poq/syncDir/gitRepos/gi.op.fo/srv.guru/trunk/wc2sd/exec/ +# echo "[srv-guru-backup]: <=== download wc2sd/db/" +# rsync -v -a --progress --stats -e 'ssh -p 1808' trunk@135.181.193.110:/home/trunk/wc2sd/db/ /home/poq/syncDir/gitRepos/gi.op.fo/srv.guru/trunk/wc2sd/db/ +# echo "[srv-guru-backup]: <=== download cron_export/" +# rsync -v -a --progress --stats -e 'ssh -p 1808' trunk@135.181.193.110:/home/trunk/cron_export/ /home/poq/syncDir/gitRepos/gi.op.fo/srv.guru/trunk/cron_export/ +# echo "[srv-guru-backup]: <=== download .ssh/" +# rsync -v -a --progress --stats -e 'ssh -p 1808' trunk@135.181.193.110:/home/trunk/.ssh/ /home/poq/syncDir/gitRepos/gi.op.fo/srv.guru/trunk/.ssh/ # } # gpx2jon() { -# cd /home/poq/syncDir/gitRepos/gi.op.fo/gpx2jon/src -# source venv/bin/activate -# python archi.py -s /home/poq/syncDir/gitRepos/gi.op.fo/fiodb/db/gpx2jon/sites -# deactivate +# cd /home/poq/syncDir/gitRepos/gi.op.fo/gpx2jon/src +# source venv/bin/activate +# python archi.py -s /home/poq/syncDir/gitRepos/gi.op.fo/fiodb/db/gpx2jon/sites +# deactivate # } # gpx2jon-with-build-all() { -# gpx2jon -# frodr.com-build-all +# gpx2jon +# frodr.com-build-all # } --- @@ -66,8 +66,8 @@ # hummed # --- #hummed-activate() { -# cd /home/poq/syncDir/gitRepos/gi.op.fo/hummed/src -# source venv/bin/activate +# cd /home/poq/syncDir/gitRepos/gi.op.fo/hummed/src +# source venv/bin/activate #} #hummed() { # hummed-activate @@ -77,28 +77,28 @@ #} #noctur.no-build() { -# jongleur-activate -# /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/run.sh -# deactivate +# jongleur-activate +# /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/run.sh +# deactivate # jump-to-downloads #} #noctur.no-build-all() { -# jongleur-activate -# /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/runAll.sh -# deactivate +# jongleur-activate +# /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/runAll.sh +# deactivate # jump-to-downloads #} #alias noctur.no-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/gitRepos/gi.op.fo/noctur.no/jongleur/html_export/ usr@178.156.192.201:/var/www/noctur.no/jongleur/" #christcast.org-build() { -# jongleur-activate -# /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/run.sh -# deactivate +# jongleur-activate +# /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/run.sh +# deactivate # jump-to-downloads #} #christcast.org-build-all() { -# jongleur-activate -# /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/runAll.sh -# deactivate +# jongleur-activate +# /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/runAll.sh +# deactivate # jump-to-downloads #} #alias christcast.org-deploy="rsync -v -a --progress --stats --delete-delay -e 'ssh -p 1808' /home/poq/syncDir/gitRepos/gi.op.fo/christcast.org/jongleur/html_export/ usr@178.156.192.201:/var/www/christcast.org/jongleur/" @@ -180,9 +180,9 @@ # #monitor() { # cmd="info" -# if [[ -n $1 ]]; then -# cmd=$1 -# fi +# if [[ -n $1 ]]; then +# cmd=$1 +# fi # # if [ ${cmd} == "on" ] ; then # # (standby) (suspend) (off) @@ -204,9 +204,9 @@ # #screensaver() { # cmd="info" -# if [[ -n $1 ]]; then -# cmd=$1 -# fi +# if [[ -n $1 ]]; then +# cmd=$1 +# fi # # if [ ${cmd} == "on" ] ; then # xset dpms @@ -238,9 +238,9 @@ #rshift() { # cmd="info" -# if [[ -n $1 ]]; then -# cmd=$1 -# fi +# if [[ -n $1 ]]; then +# cmd=$1 +# fi # # temperature_file="/tmp/temperature.txt" # @@ -283,7 +283,7 @@ #} #ascii() { -# if [[ -n $1 ]] ; then +# if [[ -n $1 ]] ; then # if [[ $1 == "banner" ]] && [[ -n $2 ]] ; then # figlet -w 200 -f ANSI\ Shadow $2 # elif [[ $1 == "date" ]] ; then @@ -352,7 +352,7 @@ #} # iso-mount() { -# sudo mount -o loop "$1" /media/iso +# sudo mount -o loop "$1" /media/iso # } # alias iso-unmount="sudo umount /media/iso" # @@ -365,9 +365,29 @@ # downstream() { # output="output.mp4" -# # https://stackoverflow.com/questions/3601515/how-to-check-if-a-variable-is-set-in-bash -# if [[ -n $2 ]]; then -# output=$2 -# fi -# ffmpeg -i "$1" -c copy -bsf:a aac_adtstoasc "/home/poq/syncDir/0_downloads/${output}" +# # https://stackoverflow.com/questions/3601515/how-to-check-if-a-variable-is-set-in-bash +# if [[ -n $2 ]]; then +# output=$2 +# fi +# ffmpeg -i "$1" -c copy -bsf:a aac_adtstoasc "/home/poq/syncDir/0_downloads/${output}" +# } + + +#gpxImporter() { +# cd /home/poq/syncDir/repos/git/gi.op.fo/gpx-importer/go/src/ +# go run main.go +# cd - +#} + +#alias videoCompressor="/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2104_videoCompressor/src/vc_v2.sh" +#alias videoWatermark="/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2104_videoCompressor/src/vcwm_v1.sh" +#alias toJpg='/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2306_toJpg/toJpg.sh' + +# ajp-cp2dropbox() { +# "/home/poq/syncDir/repos/git/gi.op.fo/miniProjects/2106_ajpDropboxDeployer/archi.sh" "$1" "$2" +# } + +# podigy-pywsdb() { +# podigy +# /home/poq/syncDir/repos/git/gi.op.fo/pyws/deploy/deployToBuildServer.sh db # }