From 59c7011aceee4a122495f92de0dc191fbb4f8293 Mon Sep 17 00:00:00 2001 From: "Fred T. Hamster" Date: Wed, 8 Feb 2012 19:50:05 -0500 Subject: [PATCH] improvements in organization of the aliases, still ongoing. --- scripts/core/common.alias | 54 ++++++++++++++++++++++----------------- scripts/core/functions.sh | 32 ++++++++++++++++------- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/scripts/core/common.alias b/scripts/core/common.alias index 8da145d9..54f0e955 100644 --- a/scripts/core/common.alias +++ b/scripts/core/common.alias @@ -1,12 +1,10 @@ # common aliases for feisty_meow are located here. -# most should work in any bash environment. +# most of these should work in any bash environment... +# although some may require more than bash, like the aliases +# that invoke perl scripts. -alias aliases=alias -#alias arch='if [ -f /bin/arch ]; then /bin/arch; else uname -m; fi' -alias cd..='\cd ..' -alias cd...='\cd ../..' -alias cd....='\cd ../../..' -alias cd.....='\cd ../../../..' +# repurposes certain commands that feisty meow does a little differently. +alias cls='clear_colormap; clear' alias copy='\cp -i -v ' alias cp='\cp -i -v ' alias cvs='perl $FEISTY_MEOW_SCRIPTS/rev_control/cvs_fix.pl' @@ -15,37 +13,47 @@ alias deltree='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl' alias df='\df -m' alias dir='perl $FEISTY_MEOW_SCRIPTS/files/summing_dir.pl' alias du='\du -h' -alias dvd_rip='vobcopy -m' alias erase='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl' alias l='\ls -FC $color_add' alias ls='\ls -FC $color_add' alias lsd='ls -l' alias md='mkdir' -alias mo='less' alias more='less' alias move='mv -i -v ' -alias mplayer='\mplayer -ao arts' alias mv='\mv -i -v ' -alias np='gvim' +alias rd='perl $FEISTY_MEOW_SCRIPTS/files/zapdirs.pl' +alias ren='\mv -v -i ' +alias rm='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl' +alias rmdir='perl $FEISTY_MEOW_SCRIPTS/files/zapdirs.pl' alias path='echo $PATH' +alias whence=which + +# some aliases that are just generally nice to have. +alias aliases=alias +alias calc='kcalc' +alias cd..='\cd ..' +alias cd...='\cd ../..' +alias cd....='\cd ../../..' +alias cd.....='\cd ../../../..' +alias mo='less' +alias np='gvim' +alias up='cd ..' + +# extended aliases for meta-operations. +alias dvd_rip='vobcopy -m' +alias mplayer='\mplayer -ao arts' alias play='bash $FEISTY_MEOW_SCRIPTS/multimedia/sound_play.sh' -alias rmdir='perl $FEISTY_MEOW_SCRIPTS/files/zapdirs.pl' -alias rd='perl $FEISTY_MEOW_SCRIPTS/files/zapdirs.pl' + +# some really eccentric feisty meow aliases... + +alias bye='. $FEISTY_MEOW_SCRIPTS/users/goodbye.sh' + # redoes fred's set of custom scripts. alias recustomize='cpdiff $FEISTY_MEOW_DIR/examples/custom_overrides/fred $FEISTY_MEOW_GENERATED/custom' -#regen-- this might be better as a function. -alias regenerate='bash $FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh ; echo ; nechung' +# makes root user's home directory's permissions right. alias reroot='chown -R root:root /root' -alias rm='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl' -alias ren='\mv -v -i ' -alias up='cd ..' -alias whence=which #hmmm: move these to the custom area? -# Standard CAK aliases that add to or extend Unix commands. -alias bye='. $FEISTY_MEOW_SCRIPTS/users/goodbye.sh' -alias calc='kcalc' -alias cls='clear_colormap; clear' if [ "$OS" != "Windows_NT" ]; then if [ -n "$IS_DARWIN" ]; then # case for mac os x. diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 31e94a04..524d6cc2 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -14,13 +14,13 @@ function date_stringer() { # makes a directory of the name specified and then tries to change the # current directory to that directory. -function mcd { +function mcd() { if [ ! -d "$1" ]; then mkdir -p "$1"; fi cd "$1" } # locates a process given a search pattern to match in the process list. -function psfind { +function psfind() { PID_DUMP="$(mktemp "$TMP/zz_pidlist.XXXXXX")" appropriate_pattern='s/^[-a-zA-Z_0-9][-a-zA-Z_0-9]* *\([0-9][0-9]*\).*$/\1/p' # pattern to use for peeling off the process numbers. @@ -45,7 +45,7 @@ function psfind { # finds all processes matching the pattern specified and shows their full # process listing (whereas psfind just lists process ids). -function psa { +function psa() { p=$(psfind "$1") if [ ! -z "$p" ]; then echo "" @@ -87,13 +87,13 @@ function psa { # pcl. if the input postscript causes ghostscript to bomb out, there has been # some good success running ps2ps on the input file and using the cleaned # postscript file for printing. -function ps2pcl2lpr { +function ps2pcl2lpr() { for $i in $*; do gs -sDEVICE=pcl3 -sOutputFile=- -sPAPERSIZE=letter "$i" | lpr -l done } -function fix_alsa { +function fix_alsa() { sudo /etc/init.d/alsasound restart } @@ -111,7 +111,7 @@ function dos_to_msys_path() { # su function: makes su perform a login. # for some OSes, this transfers the X authority information to the new login. -function su { +function su() { # decide if we think this is debian or ubuntu or a variant. DEBIAN_LIKE=$(if [ ! -z "$(grep -i debian /etc/issue)" \ -o ! -z "$(grep -i ubuntu /etc/issue)" ]; then echo 1; else echo 0; fi) @@ -143,7 +143,7 @@ function su { # sudo function wraps the normal sudo by ensuring we replace the terminal # label if they're doing an su with the sudo. -function sudo { +function sudo() { local first_command="$1" /usr/bin/sudo $* if [ "$first_command" == "su" ]; then @@ -155,7 +155,7 @@ function sudo { # buntar is a long needed uncompressing macro that feeds into tar -x. # it takes a list of bz2 file names and extracts their contents into # sequentially numbered directories. -function buntar { +function buntar() { index=1 for i in $*; do mkdir buntar_$index @@ -174,11 +174,25 @@ function buntar { # trashes the .#blah files that cvs and svn leave behind when finding conflicts. # this kind of assumes you've already checked them for any salient facts. -function clean_cvs_junk { +function clean_cvs_junk() { for i in $*; do find $i -follow -type f -iname ".#*" -exec perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl {} ";" done } +# recreates all the generated files that the feisty meow scripts use. +function regenerate() { + bash $FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh + echo + local wheres_nechung=$(which nechung) + if [ -z "$wheres_nechung" ]; then + echo "The nechung oracle program cannot be found. You may want to consider" + echo "rebuilding the feisty meow applications with this command:" + echo " bash $FEISTY_MEOW_DIR/scripts/generator/bootstrap_build.sh" + else + nechung + fi +} + if [ ! -z "$SHELL_DEBUG" ]; then echo function definitions end....; fi -- 2.34.1