From 322c4c28404c33372c15d71eafe021d2099c320a Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 29 May 2020 20:54:51 -0400 Subject: [PATCH] minor cleanings and rearrangings --- scripts/core/functions.sh | 63 ++++++++++++++------------------------- scripts/core/variables.sh | 4 +-- 2 files changed, 23 insertions(+), 44 deletions(-) diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 7876fb90..647c8ef9 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -355,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. @@ -422,31 +406,6 @@ if [ -z "$skip_all" ]; then fi } -#bork # su function: makes su perform a login. -#bork # for some OSes, this transfers the X authority information to the new login. -#bork function su() { -#bork if debian_like; then -#bork # debian currently requires the full version which imports X authority -#bork # information for su. -#bork -#bork # get the x authority info for our current user. -#bork source "$FEISTY_MEOW_SCRIPTS/security/get_x_auth.sh" -#bork -#bork if [ -z "$X_auth_info" ]; then -#bork # if there's no authentication info to pass along, we just do a normal su. -#bork /bin/su -l $* -#bork else -#bork # under X, we update the new login's authority info with the previous -#bork # user's info. -#bork (unset XAUTHORITY; /bin/su -l $* -c "$X_auth_info ; export DISPLAY=$DISPLAY ; bash") -#bork fi -#bork else -#bork # non-debian supposedly doesn't need the extra overhead any more. -#bork # or at least suse doesn't, which is the other one we've tested on. -#bork /bin/su -l $* -#bork fi -#bork } - # this function wraps the normal sudo by ensuring we replace the terminal # label before we launch what they're passing to sudo. we also ensure that # the feisty meow environment is recreated; normal subshells don't need @@ -988,6 +947,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() diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index c843dba6..333598ad 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -132,9 +132,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org mkdir -p "$FEISTY_MEOW_GENERATED_STORE" fi # set up our effluent outsourcing valves. - if [ -z "$TEMPORARIES_PILE" ]; then - define_yeti_variable TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries" - fi + define_yeti_variable TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries" if [ ! -d "$TEMPORARIES_PILE" ]; then mkdir -p "$TEMPORARIES_PILE" fi -- 2.34.1