X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=3a2151b1f22a68814e360c62ecb334df16851911;hb=3ccfc799c6e1bcc3c0b282797267a65aa7e4c714;hp=12cc77175b7a8f8c9b3cb4a9bde66e6df5ceb35c;hpb=f62e32a87b2599bebdca57827c773cb1f97a7890;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 12cc7717..3a2151b1 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -61,6 +61,23 @@ if [ -z "$skip_all" ]; then ############## + function fm_username() + { + # see if we can get the user name from the login name. oddly this sometimes doesn't work. + local custom_user="$(logname 2>/dev/null)" + if [ -z "$custom_user" ]; then + # try the normal unix user variable. + custom_user="$USER" + fi + if [ -z "$custom_user" ]; then + # try the windows user variable. + custom_user="$USERNAME" + fi + echo "$custom_user" + } + + ############## + # displays the value of a variable in bash friendly format. function var() { HOLDIFS="$IFS" @@ -182,7 +199,7 @@ if [ -z "$skip_all" ]; then # wraps secure shell with some parameters we like, most importantly to enable X forwarding. function ssh() { - local args=($*) + local args=($@) # we remember the old terminal title, then force the TERM variable to a more generic # version for the other side (just 'linux'); we don't want the remote side still # thinking it's running xterm. @@ -194,7 +211,7 @@ if [ -z "$skip_all" ]; then # local oldterm="$TERM" # export TERM=linux - /usr/bin/ssh -X -C "${args[@]}" + /usr/bin/ssh -Y -C "${args[@]}" # # restore the terminal variable also. # TERM="$oldterm" @@ -338,22 +355,6 @@ if [ -z "$skip_all" ]; then done } -#hmmm: not really doing anything yet; ubuntu seems to have changed from pulseaudio in 17.04? - # restarts the sound driver. - function fix_sound_driver() { - # stop bash complaining about blank function body. - local nothing= -#if alsa something -# sudo service alsasound restart -#elif pulse something -# sudo pulseaudio -k -# sudo pulseaudio -D -#else -# something else...? -#fi - - } - function screen() { save_terminal_title #hmmm: ugly absolute path here. @@ -383,13 +384,13 @@ if [ -z "$skip_all" ]; then fi } - # switches from an X:/ form to a /cygdrive/X/path form. this is only useful - # for the cygwin environment currently. - function dos_to_unix_path() { - # we always remove dos slashes in favor of forward slashes. -#old: echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/' - echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/cygdrive\/\1\/\2/' - } +# # switches from an X:/ form to a /cygdrive/X/path form. this is only useful +# # for the cygwin environment currently. +# function dos_to_unix_path() { +# # we always remove dos slashes in favor of forward slashes. +##old: echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/' +# echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/cygdrive\/\1\/\2/' +# } # returns a successful value (0) if this system is debian or ubuntu. function debian_like() { @@ -405,42 +406,62 @@ if [ -z "$skip_all" ]; then fi } - # su function: makes su perform a login. - # for some OSes, this transfers the X authority information to the new login. - function su() { - if debian_like; then - # debian currently requires the full version which imports X authority - # information for su. - - # get the x authority info for our current user. - source "$FEISTY_MEOW_SCRIPTS/security/get_x_auth.sh" - - if [ -z "$X_auth_info" ]; then - # if there's no authentication info to pass along, we just do a normal su. - /bin/su -l $* - else - # under X, we update the new login's authority info with the previous - # user's info. - (unset XAUTHORITY; /bin/su -l $* -c "$X_auth_info ; export DISPLAY=$DISPLAY ; bash") - fi - else - # non-debian supposedly doesn't need the extra overhead any more. - # or at least suse doesn't, which is the other one we've tested on. - /bin/su -l $* - fi - } - - # sudo function wraps the normal sudo by ensuring we replace the terminal - # label if they're doing an su with the sudo. + # this function wraps the normal sudo by ensuring we replace the terminal + # label before we launch what they're passing to sudo. we also preserve + # specific variables that enable the main user's ssh credentials to still + # be relied on for ssh forwarding, even if the '-i' flag is passed to cause + # a fresh shell (which normally doesn't get the launching user's environment + # variables). + +##questioning our approach: we also ensure that +# # the feisty meow environment is recreated; normal subshells don't need +# # this, but when switching identity with sudo, it seems important. yet, +# # we also don't want to hose up their normal sudo actions, such as passing +# # along the current environment, should the user choose. + function sudo() { save_terminal_title - /usr/bin/sudo "$@" + + # hoist our X authorization info in case environment is passed along; + # this can allow root to use our display to show X.org windows. + if [ -z "$IMPORTED_XAUTH" -a ! -z "$DISPLAY" ]; then + export IMPORTED_XAUTH="$(xauth list $DISPLAY | head -n 1 | awk '{print $3}')" + fi + + # launch sudo with just the variables we want to reach the other side. + # we take an extra step to null out the PATH, since MacOS seems to want + # to pass that even for a login shell (-i) somehow. + PATH= /usr/bin/sudo --preserve-env=SSH_AUTH_SOCK,IMPORTED_XAUTH "$@" +#"SSH_AUTH_SOCK='$SSH_AUTH_SOCK'" "IMPORTED_XAUTH='$IMPORTED_XAUTH'" "$@" + retval=$? + + unset IMPORTED_XAUTH + restore_terminal_title + return $retval + +##potential boneyard: + # prep a simple command string here, rather than messing with arguments + # in the already complicated command below. i was seeing some really + # screwy behavior trying to expand $@ when embedded for the bash -c flag, + # but making the variable ahead of time gets rid of that. + cmd="/usr/bin/sudo --preserve-env=SSH_AUTH_SOCK,IMPORTED_XAUTH ""$@" + + # omit any variables that are either wrong for a different user or used + # to shield the feisty meow scripts from reconfiguring. when we do the + # sudo, we want a fresh start for feisty meow at least. + # our approach to launching sudo is further complicated by our sentinel + # alias, which normally is passed to any subshells (to prevent recreating + # aliases). we turn off the expand_aliases shell option to avoid passing + # the sentinel, which ensures aliases do get recreated for the new user. + BUILD_VARS_LOADED= \ + CORE_VARIABLES_LOADED= \ + FEISTY_MEOW_SCRIPTS_LOADED= \ + function_sentinel= \ + MAIL= \ + HOME= \ + bash +O expand_aliases -c "$cmd" retval=$? restore_terminal_title -# if [ "$first_command" == "su" ]; then -# # yep, they were doing an su, but they're back now. -# label_terminal_with_info -# fi return $retval } @@ -493,11 +514,13 @@ if [ -z "$skip_all" ]; then local custom_user="$1"; shift if [ -z "$custom_user" ]; then # default to login name if there was no name provided. - custom_user="$(logname)" - # we do intend to use logname here to get the login name and to ignore + custom_user="$(fm_username)" + # we do intend to use the login name here to get the login name and to ignore # if the user has sudo root access; we don't want to provide a custom # profile for root. fi + # chop off any email address style formatting to leave just the name. + custom_user="$(echo "$custom_user" | cut -f1 -d'@')" save_terminal_title @@ -517,59 +540,6 @@ we will skip recustomization, but these other customizations are available: return 1 fi -#hmmm: begin old custom section... -#hmmm: here is where it starts being wrong for a link due to current borked copy approach. -## # prevent permission foul-ups. -## my_user="$USER" -## # here we definitely want the effective user name (in USER), since -## # we don't want, say, fred (as logname) to own all of root's loading -## # dock stuff. -###hmmm: argh, seems a bit heavyweight to do chowning here! -## chown -R "$my_user:$my_user" \ -## "$FEISTY_MEOW_LOADING_DOCK"/* "$FEISTY_MEOW_GENERATED_STORE"/* 2>/dev/null -## continue_on_error "chowning feisty meow generated directories to $my_user" -## -## regenerate >/dev/null -## -## pushd "$FEISTY_MEOW_LOADING_DOCK/custom" &>/dev/null -## incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" "$FEISTY_MEOW_LOADING_DOCK/custom")" -## -## local fail_message="\n -##are the perl dependencies installed? if you're on ubuntu or debian, try this:\n -## $(grep "apt.*perl" $FEISTY_MEOW_APEX/readme.txt)\n -##or if you're on cygwin, then try this (if apt-cyg is available):\n -## $(grep "apt-cyg.*perl" $FEISTY_MEOW_APEX/readme.txt)\n"; -## -## #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 -## log_feisty_meow_event "cleaning unknown older overrides..." -## perl "$FEISTY_MEOW_SCRIPTS/files/safedel.pl" $incongruous_files -## continue_on_error "running safedel. $fail_message" -## fi -## popd &>/dev/null -## log_feisty_meow_event "copying custom overrides for $custom_user" -## mkdir -p "$FEISTY_MEOW_LOADING_DOCK/custom" 2>/dev/null -## perl "$FEISTY_MEOW_SCRIPTS/text/cpdiff.pl" "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" "$FEISTY_MEOW_LOADING_DOCK/custom" -## continue_on_error "running cpdiff. $fail_message" -## -## if [ -d "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" ]; then -## log_feisty_meow_event "copying custom scripts for $custom_user" -###hmmm: could save output to show if an error occurs. -## rsync -avz "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" "$FEISTY_MEOW_LOADING_DOCK/custom/" &>/dev/null -## continue_on_error "copying customization scripts" -## fi -## regenerate -## -## # prevent permission foul-ups, again. -## chown -R "$my_user:$my_user" \ -## "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE" 2>/dev/null -## continue_on_error "once more chowning feisty meow generated directories to $my_user" -#hmmm: begin old custom section. - -#### - -#hmmm: begin new customization section... # recreate the feisty meow loading dock. regenerate >/dev/null @@ -579,13 +549,23 @@ we will skip recustomization, but these other customizations are available: # there's an existing link, so remove it. \rm custom fi + # make sure we cleaned up the area before we re-link. if [ -h custom -o -d custom -o -f custom ]; then echo " Due to an over-abundance of caution, we are not going to remove an unexpected -'custom' object in the file system. This is located here: - $(pwd) +'custom' object found in the file system. This object is located in the +feisty meow loading dock here: $(pwd) +And here is a description of the rogue 'custom' object: " - ls -al . + ls -al custom + echo " +If you are pretty sure that this is just a remnant of an older approach in +feisty meow, where we copied the custom directory rather than linking it +(and it most likely is just such a bit of cruft of that nature), then please +remove that old remnant 'custom' item, for example by saying: + /bin/rm -rf \"custom\" ; popd +Sorry for the interruption, but we want to make sure this removal wasn't +automatic if there is even a small amount of doubt about the issue." return 1 fi @@ -596,9 +576,6 @@ Due to an over-abundance of caution, we are not going to remove an unexpected # now take into account all the customizations by regenerating the feisty meow environment. regenerate -#hmmm: end new customization section. - -#### restore_terminal_title } @@ -973,7 +950,7 @@ return 0 local charnfile="$(mktemp $TMP/zz_charn.XXXXXX)" find "${dirs[@]}" -follow -maxdepth 1 -mindepth 1 -type f | \ grep -i \ -"docx\|eml\|html\|jpeg\|jpg\|m4a\|mov\|mp3\|ods\|odt\|pdf\|png\|pptx\|txt\|xlsx\|zip" | \ +"doc\|docx\|eml\|html\|jpeg\|jpg\|m4a\|mov\|mp3\|ods\|odt\|pdf\|png\|ppt\|pptx\|txt\|vsd\|vsdx\|xls\|xlsx\|zip" | \ sed -e 's/^/"/' | sed -e 's/$/"/' | \ xargs bash "$FEISTY_MEOW_SCRIPTS/files/spacem.sh" # drop the temp file now that we're done. @@ -992,6 +969,28 @@ return 0 ############## + # you have hit the borderline functional zone... + +#hmmm: not really doing anything yet; ubuntu seems to have changed from pulseaudio in 17.04? + # restarts the sound driver. + function fix_sound_driver() { + # stop bash complaining about blank function body. + local nothing= +#if alsa something +# sudo service alsasound restart +#elif pulse something +# sudo pulseaudio -k +# sudo pulseaudio -D +#else +# something else...? +#fi + + } + + # ...and here's the end of the borderline functional zone. + + ############## + # NOTE: no more function definitions are allowed after this point. function function_sentinel()