From 3bbb4d6c9a35da268ee615aa5a9d0be324e51427 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 5 Oct 2016 02:05:06 +0200 Subject: [PATCH] Renamed envs and bash/scriptlets to *.d --- bash/{scriptlets => bash.d}/aliases | 0 bash/{scriptlets => bash.d}/colours | 0 bash/{scriptlets => bash.d}/fortune | 0 bash/{scriptlets => bash.d}/history | 0 bash/{scriptlets => bash.d}/ps1 | 0 bash/bashrc | 4 ++-- bash/scriptlets/00-marietje | 4 ---- bash/scriptlets/alias-ru | 6 ------ bash/scriptlets/cert_status | 5 ----- bash/scriptlets/dropbox | 5 ----- bash/scriptlets/iraf | 4 ---- bash/scriptlets/wttr | 14 -------------- bash/scriptlets/zz-fatserf-greet | 2 -- envs/cfitsio.active | 1 - envs/gaia.active | 5 ----- envs/healpix.active | 8 -------- envs/marie.active | 15 --------------- envs/starlink | 6 ------ 18 files changed, 2 insertions(+), 77 deletions(-) rename bash/{scriptlets => bash.d}/aliases (100%) rename bash/{scriptlets => bash.d}/colours (100%) rename bash/{scriptlets => bash.d}/fortune (100%) rename bash/{scriptlets => bash.d}/history (100%) rename bash/{scriptlets => bash.d}/ps1 (100%) delete mode 100644 bash/scriptlets/00-marietje delete mode 100644 bash/scriptlets/alias-ru delete mode 100644 bash/scriptlets/cert_status delete mode 100644 bash/scriptlets/dropbox delete mode 100644 bash/scriptlets/iraf delete mode 100644 bash/scriptlets/wttr delete mode 100644 bash/scriptlets/zz-fatserf-greet delete mode 100644 envs/cfitsio.active delete mode 100644 envs/gaia.active delete mode 100644 envs/healpix.active delete mode 100644 envs/marie.active delete mode 100644 envs/starlink diff --git a/bash/scriptlets/aliases b/bash/bash.d/aliases similarity index 100% rename from bash/scriptlets/aliases rename to bash/bash.d/aliases diff --git a/bash/scriptlets/colours b/bash/bash.d/colours similarity index 100% rename from bash/scriptlets/colours rename to bash/bash.d/colours diff --git a/bash/scriptlets/fortune b/bash/bash.d/fortune similarity index 100% rename from bash/scriptlets/fortune rename to bash/bash.d/fortune diff --git a/bash/scriptlets/history b/bash/bash.d/history similarity index 100% rename from bash/scriptlets/history rename to bash/bash.d/history diff --git a/bash/scriptlets/ps1 b/bash/bash.d/ps1 similarity index 100% rename from bash/scriptlets/ps1 rename to bash/bash.d/ps1 diff --git a/bash/bashrc b/bash/bashrc index f25f6b2..36847ea 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -24,10 +24,10 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then fi # Load main things -if [ -d "$DOTBASH/scriptlets" ]; then +if [ -d "$DOTBASH/bash.d" ]; then for f in colours aliases history ps1 do - source "$DOTBASH/scriptlets/$f" + source "$DOTBASH/bash.d/$f" done fi diff --git a/bash/scriptlets/00-marietje b/bash/scriptlets/00-marietje deleted file mode 100644 index 7e7f792..0000000 --- a/bash/scriptlets/00-marietje +++ /dev/null @@ -1,4 +0,0 @@ -# Get Marietje and shizzle -if [ -f /vol/impuls/marcur/bashrc ]; then - . /vol/impuls/marcur/bashrc -fi diff --git a/bash/scriptlets/alias-ru b/bash/scriptlets/alias-ru deleted file mode 100644 index ecb82c4..0000000 --- a/bash/scriptlets/alias-ru +++ /dev/null @@ -1,6 +0,0 @@ -#Aliases for RU -alias lilo='ssh lilo' -alias MC='cd ~/MC; echo "Welcome to Marie Curie"' -alias MCMail='~/MC/www/mailer/mariemailer.psql.pl' -alias DocMail='~/MC/www/mailer/docentmailer.pl' - diff --git a/bash/scriptlets/cert_status b/bash/scriptlets/cert_status deleted file mode 100644 index 9ba4c08..0000000 --- a/bash/scriptlets/cert_status +++ /dev/null @@ -1,5 +0,0 @@ -# Report on last renewing of ssl certificates -CERTSTAT=~/cert_status -if [ -r $CERTSTAT ]; then - echo "Last certs: $(cat $CERTSTAT)"; -fi; diff --git a/bash/scriptlets/dropbox b/bash/scriptlets/dropbox deleted file mode 100644 index 5357453..0000000 --- a/bash/scriptlets/dropbox +++ /dev/null @@ -1,5 +0,0 @@ -# Run the dropbox daemon in the background -if [ -x "$HOST/.dropbox-dist/dropboxd" ] -then - "$HOST/.dropbox-dist/dropboxd" & alias killDropbox='kill $!' -fi diff --git a/bash/scriptlets/iraf b/bash/scriptlets/iraf deleted file mode 100644 index 1a9cbce..0000000 --- a/bash/scriptlets/iraf +++ /dev/null @@ -1,4 +0,0 @@ -# Add iraf setup commands -if [ -e /home/ericteunis/.iraf/setup.sh ]; then - source /home/ericteunis/.iraf/setup.sh -fi diff --git a/bash/scriptlets/wttr b/bash/scriptlets/wttr deleted file mode 100644 index 8e79e54..0000000 --- a/bash/scriptlets/wttr +++ /dev/null @@ -1,14 +0,0 @@ -WTTR=~/.wttr -if [ -f $WTTR ]; then - cat $WTTR - alias wttr='cat $WTTR' -else - read -p "{$Yel}Do you want your weather cronned? " -n 1 -r - echo - if [[ $REPLY =~ ^[Yy]$ ]] - then - cronjob="curl -s wttr.in/Voorthuizen | sec -n 3,7p > $WTTR 2>&1 " - croncmd="27 */2 * * * $cronjob" - ( crontab -l | grep -v -F "$croncmd" ; echo "$cronjob" ) | crontab - - fi -fi diff --git a/bash/scriptlets/zz-fatserf-greet b/bash/scriptlets/zz-fatserf-greet deleted file mode 100644 index d8a1e97..0000000 --- a/bash/scriptlets/zz-fatserf-greet +++ /dev/null @@ -1,2 +0,0 @@ -echo "Welcome onboard:" -figlet -t sXc : fatSerf diff --git a/envs/cfitsio.active b/envs/cfitsio.active deleted file mode 100644 index e1fdcce..0000000 --- a/envs/cfitsio.active +++ /dev/null @@ -1 +0,0 @@ -export CFITSIO=/home/edeboone/Documents/Stage/bin/cfitsio diff --git a/envs/gaia.active b/envs/gaia.active deleted file mode 100644 index 8b7da81..0000000 --- a/envs/gaia.active +++ /dev/null @@ -1,5 +0,0 @@ -# Starlink - -export STARLINK_DIR=/vol/optcoma/star-namaka - -[ -r $STARLINK_DIR/etc/profile ] && . $STARLINK_DIR/etc/profile diff --git a/envs/healpix.active b/envs/healpix.active deleted file mode 100644 index 2df3575..0000000 --- a/envs/healpix.active +++ /dev/null @@ -1,8 +0,0 @@ -# modifications by HEALPixAutoConf 3.31 - -# Version 3.20 -export HEALPIX_CONFIG=/home/edeboone/Documents/Stage/bin/Healpix_3.20/confdir/3_20_Linux/config - -# Version 3.31 -#export HEALPIX_CONFIG=/home/edeboone/Documents/Stage/bin/Healpix_3.31/confdir/3_31_Linux/config -[ -r $HEALPIX_CONFIG ] && . $HEALPIX_CONFIG diff --git a/envs/marie.active b/envs/marie.active deleted file mode 100644 index 2a9d0fa..0000000 --- a/envs/marie.active +++ /dev/null @@ -1,15 +0,0 @@ -MC=/vol/impuls/marcur -PATH=$MC/common/bin:$PATH - -if [[ -d $HOME/public/bin ]]; then - PATH=$HOME/public/bin:$PATH -fi - -if [[ -d $HOME/bin ]]; then - PATH=$HOME/bin:$PATH -fi - -MANPATH=$MC/lilo/share/man:$MANPATH -## export it all -export PATH -export MANPATH diff --git a/envs/starlink b/envs/starlink deleted file mode 100644 index 758467a..0000000 --- a/envs/starlink +++ /dev/null @@ -1,6 +0,0 @@ -# Add StarLink -STARLINK_DIR='/mnt/data/user/bin/star-hikianalia' -if [ -e $STARLINK_DIR"/etc/profile" ]; then - source $STARLINK_DIR"/etc/profile" -fi -