X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fcommon.alias;h=7dc95071b977dc7a57e0f3a41821dd6796fd15ce;hb=70734afa93c099fa78a1e9d801d99685b7cd39d6;hp=ba2e44bedba7c5641dd21fddc9063ec4e7e0dbda;hpb=70de25680cc889b69c99a3e2371ab3d2793fef85;p=feisty_meow.git

diff --git a/scripts/core/common.alias b/scripts/core/common.alias
index ba2e44be..7dc95071 100644
--- a/scripts/core/common.alias
+++ b/scripts/core/common.alias
@@ -13,6 +13,11 @@
 
 ##############
 
+# make our functions available to the aliases.
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+
+##############
+
 # call the generated aliases file, if it exists.
 # we do this first so that our core aliases get a chance to override the aliases
 # based on scripts.
@@ -31,7 +36,7 @@ define_yeti_alias copy='\cp -i -v'
 define_yeti_alias cp='\cp -i -v'
 define_yeti_alias del='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl'
 define_yeti_alias deltree='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl'
-define_yeti_alias df='\df -mh'
+define_yeti_alias df='\df -h'
 define_yeti_alias dir='perl $FEISTY_MEOW_SCRIPTS/files/summing_dir.pl'
 define_yeti_alias du='\du -h'
 define_yeti_alias erase='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl'
@@ -41,8 +46,12 @@ if [ "$OS" != "Windows_NT" ]; then
   if [ -n "$IS_DARWIN" ]; then
     # case for mac os x.
     define_yeti_alias exp='open'
-  elif [ ! -z "$(which nautilus 2>/dev/null)" ]; then
-    # we prefer nautilus if available.
+  elif [ ! -z "$(whichable dolphin)" ]; then
+    # we prefer dolphin if available.
+    define_yeti_alias exp='screen -L -S dolphin-$RANDOM -d -m dolphin '
+#--select 
+  elif [ ! -z "$(whichable nautilus)" ]; then
+    # launch nautilus if available.
     define_yeti_alias exp='nautilus'
   else
     # last ditch is konqueror browser.
@@ -55,6 +64,7 @@ fi
 # re-use work we did on 'exp' macro for the longer windows command.
 define_yeti_alias explorer=exp
 define_yeti_alias fix_ssh_perms='chmod 700 $HOME/.ssh ; chmod 600 $HOME/.ssh/*'
+define_yeti_alias get_feisty='rpuffer $FEISTY_MEOW_APEX; regenerate'
 define_yeti_alias halt='sudo shutdown -h now'
 define_yeti_alias i=inventory
 define_yeti_alias l='perl $FEISTY_MEOW_SCRIPTS/files/summing_dir.pl'
@@ -107,9 +117,7 @@ define_yeti_alias add_domain="sudo bash \$FEISTY_MEOW_SCRIPTS/system/add_domain.
 define_yeti_alias remove_domain="sudo bash \$FEISTY_MEOW_SCRIPTS/system/remove_domain.sh"
 define_yeti_alias add_apache_site="sudo bash \$FEISTY_MEOW_SCRIPTS/system/add_apache_site.sh"
 define_yeti_alias remove_apache_site="sudo bash \$FEISTY_MEOW_SCRIPTS/system/remove_apache_site.sh"
-
-#hmmm: some magma intrusions from the fred customizations...
-define_yeti_alias revamp_cakelampvm="sudo bash \"$FEISTY_MEOW_SCRIPTS/site_avenger/revamp_cakelampvm.sh\""
+define_yeti_alias add_swap_mount="sudo bash \$FEISTY_MEOW_SCRIPTS/system/add_swap_mount.sh"
 
 ##############
 
@@ -123,12 +131,18 @@ define_yeti_alias play='bash $FEISTY_MEOW_SCRIPTS/multimedia/sound_play.sh'
 
 # some really eccentric feisty meow aliases...
 
+# launches a bash session in the background using the screen command.
+define_yeti_alias bashido='screen -L -S bashido -d -m bash'
+
 # says goodbye when leaving a shell.
 define_yeti_alias bye='. $FEISTY_MEOW_SCRIPTS/processes/goodbye.sh'
+
 define_yeti_alias cputemp='acpi -t'
+
 # makes root user's home directory's permissions right.
 define_yeti_alias reroot='chown -R root:root /root'
-# yes, these are really helpful...
+
+# yes, these what/who/why functions are really helpful...
 define_yeti_alias whoareyou='echo -e "Hello, I am a computer named $(hostname)\nand I am very pleased to meet you."'
 define_yeti_alias whereami='echo whoa dude, try not to think about it...'
 define_yeti_alias why='echo We all wonder what the point of the universe is at times.  If you figure it all out, please write us.'
@@ -144,8 +158,3 @@ unalias fredme feistyme &>/dev/null
 
 ##############
 
-# set the sentinel alias that says this file was handled.
-#alias CORE_ALIASES_LOADED=true
-
-##############
-