X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=c2f946a8c01ef8a160c0b6af2d737bb8957b0612;hb=3bcb83e182f35554308af3a73665a217859fc875;hp=21d9d04716beb91107c1993d33cced0bf29203de;hpb=43d671a278a6f7dc0d831541d0992bc00eb23ee8;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 21d9d047..c2f946a8 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -4,13 +4,15 @@ # test whether we've been here before or not. skip_all= -function_sentinel &>/dev/null +type function_sentinel &>/dev/null if [ $? -eq 0 ]; then # there was no error, so we can skip the inits. if [ ! -z "$SHELL_DEBUG" ]; then echo "skipping function definitions, because already defined." fi skip_all=yes +else + skip_all= fi if [ -z "$skip_all" ]; then @@ -74,7 +76,7 @@ if [ -z "$skip_all" ]; then echo "$varname=${!varname}" fi fi - done + done | sort IFS="$HOLDIFS" } @@ -355,12 +357,9 @@ if [ -z "$skip_all" ]; then echo "regenerating feisty meow script environment." bash $FEISTY_MEOW_SCRIPTS/core/reconfigure_feisty_meow.sh echo - # force a full reload by turning off sentinel variable and alias. - # the nethack one is used by fred's customizations. - # interesting note perhaps: found that the NETHACKOPTIONS variable was - # not being unset correctly when preceded by an alias. split them up - # like they are now due to that bug. - unset -v CORE_ALIASES_LOADED FEISTY_MEOW_LOADING_DOCK NECHUNG NETHACKOPTIONS + # force a full reload by turning off sentinel variables and methods. + unset -v CORE_VARIABLES_LOADED FEISTY_MEOW_LOADING_DOCK USER_CUSTOMIZATIONS_LOADED + unalias CORE_ALIASES_LOADED &>/dev/null unset -f function_sentinel # reload feisty meow environment in current shell. source $FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh @@ -368,31 +367,6 @@ if [ -z "$skip_all" ]; then nechung } - # generates a random password where the first parameter is the number of characters - # in the password (default 20) and the second parameter specifies whether to use - # special characters (1) or not (0). - # found function at http://legroom.net/2010/05/06/bash-random-password-generator - function random_password() - { - [ "$2" == "0" ] && CHAR="[:alnum:]" || CHAR="[:graph:]" - cat /dev/urandom | tr -cd "$CHAR" | head -c ${1:-32} - echo - } - - # a wrapper for the which command that finds items on the path. some OSes - # do not provide which, so we want to not be spewing errors when that - # happens. - function whichable() - { - to_find="$1"; shift - which which &>/dev/null - if [ $? -ne 0 ]; then - # there is no which command here. we produce nothing due to this. - echo - fi - echo $(which $to_find) - } - # copies a set of custom scripts into the proper location for feisty meow # to merge their functions and aliases with the standard set. function recustomize() @@ -402,17 +376,17 @@ if [ -z "$skip_all" ]; then # use our default example user if there was no name provided. user=fred fi - if [ ! -d "$FEISTY_MEOW_APEX/customizing/$user" ]; then + if [ ! -d "$FEISTY_MEOW_APEX/customize/$user" ]; then echo "The customization folder provided for $user should be:" - echo " '$FEISTY_MEOW_APEX/customizing/$user'" + echo " '$FEISTY_MEOW_APEX/customize/$user'" echo "but that folder does not exist. Skipping customization." return 1 fi regenerate >/dev/null pushd "$FEISTY_MEOW_LOADING_DOCK/custom" &>/dev/null - local incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_APEX/customizing/$user" "$FEISTY_MEOW_LOADING_DOCK/custom")" - -#echo "the incongruous files list is: $incongruous_files" + incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_APEX/customize/$user" "$FEISTY_MEOW_LOADING_DOCK/custom")" + + #echo "the incongruous files list is: $incongruous_files" # disallow a single character result, since we get "*" as result when nothing exists yet. if [ ${#incongruous_files} -ge 2 ]; then echo "cleaning unknown older overrides..." @@ -422,22 +396,50 @@ if [ -z "$skip_all" ]; then popd &>/dev/null echo "copying custom overrides for $user" mkdir -p "$FEISTY_MEOW_LOADING_DOCK/custom" 2>/dev/null - perl "$FEISTY_MEOW_SCRIPTS/text/cpdiff.pl" "$FEISTY_MEOW_APEX/customizing/$user" "$FEISTY_MEOW_LOADING_DOCK/custom" - if [ -d "$FEISTY_MEOW_APEX/customizing/$user/scripts" ]; then + perl "$FEISTY_MEOW_SCRIPTS/text/cpdiff.pl" "$FEISTY_MEOW_APEX/customize/$user" "$FEISTY_MEOW_LOADING_DOCK/custom" + if [ -d "$FEISTY_MEOW_APEX/customize/$user/scripts" ]; then echo "copying custom scripts for $user" - \cp -R "$FEISTY_MEOW_APEX/customizing/$user/scripts" "$FEISTY_MEOW_LOADING_DOCK/custom/" + \cp -R "$FEISTY_MEOW_APEX/customize/$user/scripts" "$FEISTY_MEOW_LOADING_DOCK/custom/" fi echo regenerate } -#uhhh, this does what now? + # generates a random password where the first parameter is the number of characters + # in the password (default 20) and the second parameter specifies whether to use + # special characters (1) or not (0). + # found function at http://legroom.net/2010/05/06/bash-random-password-generator + function random_password() + { + [ "$2" == "0" ] && CHAR="[:alnum:]" || CHAR="[:graph:]" + cat /dev/urandom | tr -cd "$CHAR" | head -c ${1:-32} + echo + } + + # a wrapper for the which command that finds items on the path. some OSes + # do not provide which, so we want to not be spewing errors when that + # happens. + function whichable() + { + to_find="$1"; shift + which which &>/dev/null + if [ $? -ne 0 ]; then + # there is no which command here. we produce nothing due to this. + echo + fi + echo $(which $to_find) + } + +#hmmm: improve this by not adding the link +# if already there, or if the drive is not valid. function add_cygwin_drive_mounts() { for i in c d e f g h q z ; do ln -s /cygdrive/$i $i done } + ############################ + # takes a file to modify, and then it will replace any occurrences of the # pattern provided as the second parameter with the text in the third # parameter. @@ -454,13 +456,100 @@ if [ -z "$skip_all" ]; then sed -i -e "s%$pattern%$replacement%g" "$file" } + # similar to replace_pattern_in_file, but also will add the new value + # when the old one did not already exist in the file. + function replace_if_exists_or_add() + { + local file="$1"; shift + local phrase="$1"; shift + local replacement="$1"; shift + if [ -z "$file" -o ! -f "$file" -o -z "$phrase" -o -z "$replacement" ]; then + echo "replace_if_exists_or_add: needs a filename, a phrase to replace, and the" + echo "text to replace that phrase with." + return 1 + fi + grep "$phrase" "$file" >/dev/null + # replace if the phrase is there, otherwise add it. + if [ $? -eq 0 ]; then + replace_pattern_in_file "$file" "$phrase" "$replacement" + else + # this had better be the complete line. + echo "$replacement" >>"$file" + fi + } + + ############################ + + # finds a variable (first parameter) in a particular property file + # (second parameter). the expected format for the file is: + # varX=valueX + function seek_variable() + { + local find_var="$1"; shift + local file="$1"; shift + if [ -z "$find_var" -o -z "$file" -o ! -f "$file" ]; then + echo -e "seek_variable: needs two parameters, firstly a variable name, and\nsecondly a file where the variable's value will be sought." 1>&2 + return 1 + fi + + while read line; do + if [ ${#line} -eq 0 ]; then continue; fi + # split the line into the variable name and value. + IFS='=' read -a assignment <<< "$line" + local var="${assignment[0]}" + local value="${assignment[1]}" + if [ "${value:0:1}" == '"' ]; then + # assume the entry was in quotes and remove them. + value="${value:1:$((${#value} - 2))}" + fi + if [ "$find_var" == "$var" ]; then + echo "$value" + fi + done < "$file" + } + + # finds a variable (first parameter) in a particular XML format file + # (second parameter). the expected format for the file is: + # ... name="varX" value="valueX" ... + function seek_variable_in_xml() + { + local find_var="$1"; shift + local file="$1"; shift + if [ -z "$find_var" -o -z "$file" -o ! -f "$file" ]; then + echo "seek_variable_in_xml: needs two parameters, firstly a variable name, and" + echo "secondly an XML file where the variable's value will be sought." + return 1 + fi + + while read line; do + if [ ${#line} -eq 0 ]; then continue; fi + # process the line to make it more conventional looking. + line="$(echo "$line" | sed -e 's/.*name="\([^"]*\)" value="\([^"]*\)"/\1=\2/')" + # split the line into the variable name and value. + IFS='=' read -a assignment <<< "$line" + local var="${assignment[0]}" + local value="${assignment[1]}" + if [ "${value:0:1}" == '"' ]; then + # assume the entry was in quotes and remove them. + value="${value:1:$((${#value} - 2))}" + fi + if [ "$find_var" == "$var" ]; then + echo "$value" + fi + done < "$file" + } + + ############################ + # goes to a particular directory passed as parameter 1, and then removes all # the parameters after that from that directory. function push_whack_pop() { local dir="$1"; shift pushd "$dir" &>/dev/null + if [ $? -ne 0 ]; then echo failed to enter dir--quitting.; fi rm -rf $* &>/dev/null + if [ $? -ne 0 ]; then echo received a failure code when removing.; fi popd &>/dev/null } @@ -551,7 +640,34 @@ return 0 ############## - function function_sentinel() { return 0; } + # just shows a separator line for an 80 column console, or uses the first + # parameter as the number of columns to expect. + function separator() + { + count=$1; shift + if [ -z "$count" ]; then + count=79 + fi + echo + local i + for ((i=0; i < $count - 1; i++)); do + echo -n "=" + done + echo + echo + } + # alias for separator. + function sep() + { + separator $* + } + + ############## + + function function_sentinel() + { + return 0; + } if [ ! -z "$SHELL_DEBUG" ]; then echo "feisty meow function definitions done."; fi