don't want to use the bare USER variable any more, since we have seen that including an email domain (e.g. blah@flork.com instead of just blah).
so these changes should use a sanitized version without the email portion.
# use a local temporary directory if possible.
if [ -d /localtmp ]; then
- export FAST_LOCAL_STORAGE=/localtmp/$USER
+ export FAST_LOCAL_STORAGE=/localtmp/$(sanitized_username)
export TMP=$FAST_LOCAL_STORAGE/tempo
mkdir -p $TMP &>/dev/null
chmod -R 700 $FAST_LOCAL_STORAGE
# user, in order to run something from within their context. this is one way to do it
# with a semi-interactive set of steps...
sudo -u chronical bash <<eof
-echo hello this is \$USER
+echo hello this is \$(sanitized_username)
echo we be in \$(pwd)
echo "where you at?"
eof
# canonical resource.h name) and discovers any duplicates. the duplicates
# are shown with their symbolic names and file locations.
-TEMP_RESOURCE_HEADERS=/tmp/resrc_headers_$USER.txt
+TEMP_RESOURCE_HEADERS=/tmp/resrc_headers_$(sanitized_username).txt
sp='[ ]' # space and tab.
#hmmm: above ignores *anything* with app in the name.
# grep -v app_src >"$TEMP_RESOURCE_HEADERS"
-FULLDEFS=/tmp/full_definition_list_$USER.txt
+FULLDEFS=/tmp/full_definition_list_$(sanitized_username).txt
# clean up prior versions.
rm -f "$FULLDEFS"
echo done reading all definitions.
-JUST_IDS=/tmp/ids_list_$USER.txt
+JUST_IDS=/tmp/ids_list_$(sanitized_username).txt
rm -f "$JUST_IDS"
i=0
id_size=$(wc "$JUST_IDS")
-JUST_IDS_TEMP=/tmp/ids_list_temp_$USER.txt
+JUST_IDS_TEMP=/tmp/ids_list_temp_$(sanitized_username).txt
sort "$JUST_IDS" | uniq >"$JUST_IDS_TEMP"
id_temp_size=$(wc "$JUST_IDS_TEMP")
sep='_'
-tar -czf "${archive_storage_path}/${archive_tag}_bkup_$(date +"%Y$sep%m$sep%d$sep%H%M$sep%S" | tr -d '/\n/').tar.gz" "$target_asset_path" &>>$TMP/${USER}.scripts.backup_arbitrary.log
+tar -czf "${archive_storage_path}/${archive_tag}_bkup_$(date +"%Y$sep%m$sep%d$sep%H%M$sep%S" | tr -d '/\n/').tar.gz" "$target_asset_path" &>>$TMP/$(sanitized_username).scripts.backup_arbitrary.log
# decide which drive to compare.
targets="$1"
if [ -z "$targets" ]; then
- targets=($($(whichable ls) -1 /media/$USER/*))
+ targets=($($(whichable ls) -1 /media/$(sanitized_username)/*))
if [ ${#targets[@]} -gt 1 ]; then
echo "
Please provide a media drive name on the command line, because more than
echo "comparing the media drive '${targets[0]}' against local archives."
-compare_archives_with_target "/media/$USER/${targets[0]}"
+compare_archives_with_target "/media/$(sanitized_username)/${targets[0]}"
sep
if [ ! -d "$TMP" ]; then
mkdir -p $TMP
- chown $USER $TMP
+ chown $(sanitized_username) $TMP
if [ $? -ne 0 ]; then
echo "failed to chown $TMP to user's ownership."
fi
- log_feisty_meow_event "created transient area \"$TMP\" for $USER on $(date_stringer)."
+ log_feisty_meow_event "created transient area \"$TMP\" for $(sanitized_username) on $(date_stringer)."
fi
# set other temporary variables to the same place as TMP.
local custom_user="$(logname 2>/dev/null)"
if [ -z "$custom_user" ]; then
# try the normal unix user variable.
- custom_user="$USER"
+ custom_user="$(sanitized_username)"
fi
if [ -z "$custom_user" ]; then
# try the windows user variable.
# accepts any number of arguments and outputs them to the feisty meow event log.
function log_feisty_meow_event()
{
- echo -e "$(timestamper)-- ${USER}@$(hostname): $*" >> "$FEISTY_MEOW_EVENT_LOG"
+ echo -e "$(timestamper)-- $(sanitized_username)@$(hostname): $*" >> "$FEISTY_MEOW_EVENT_LOG"
}
##############
fi
# reload feisty meow environment in current shell.
- log_feisty_meow_event "reloading the feisty meow scripts for $USER in current shell."
+ log_feisty_meow_event "reloading the feisty meow scripts for $(sanitized_username) in current shell."
source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
# run nechung oracle to give user a new fortune.
nechung
splitter="cat"
fi
echo
-echo "it is $(date +"%A at %H:%M hours on day %e of the %B moon in the gregorian year %Y" | tr A-Z a-z) and our intrepid adventurer $USER is exploring a computer named $(hostname) that is running in a thoughtspace called $osname $osver (code-name $codename), and $USER has deduced that the machine's OS platform is $(uname -m) and its current incarnation has been ${up}." | $splitter
+echo "it is $(date +"%A at %H:%M hours on day %e of the %B moon in the gregorian year %Y" | tr A-Z a-z) and our intrepid adventurer $(sanitized_username) is exploring a computer named $(hostname) that is running in a thoughtspace called $osname $osver (code-name $codename), and $(sanitized_username) has deduced that the machine's OS platform is $(uname -m) and its current incarnation has been ${up}." | $splitter
echo
echo "the following things appear to be lying around here..."
echo
# set the directory tab completion to behave properly and not start escaping
# the dollar signs in variable names.
shopt -u progcomp
-
+
+ ####
+ # (function borrowed from our own variables.sh)
+ # a handy helper method that turns a potentially gross USER variable into
+ # a nice clean one (by removing email domains).
+ export SANITIZED_USER
+ function sanitized_username() {
+ if [ ! -z "$SANITIZED_USER" ]; then
+ echo -n "$SANITIZED_USER"
+ fi
+ export SANITIZED_USER="$(echo "$USER" | sed -e 's/@[a-zA-Z0-9_.]*//')"
+ echo -n "$SANITIZED_USER"
+ }
+ # call the method to ensure the variable gets loaded.
+ sanitized_username &> /dev/null
+ #####
+
# patch the user variable if we were launched by one of our cron jobs.
+ USER="$(sanitized_username)"
if [ -z "$USER" -a ! -z "$CRONUSER" ]; then
export USER="$CRONUSER"
fi
# a handy helper method that turns a potentially gross USER variable into
# a nice clean one (by removing email domains).
- export SANITIZED_USER=""
+ export SANITIZED_USER
function sanitized_username() {
if [ ! -z "$SANITIZED_USER" ]; then
echo -n "$SANITIZED_USER"
export SANITIZED_USER="$(echo "$USER" | sed -e 's/@[a-zA-Z0-9_.]*//')"
echo -n "$SANITIZED_USER"
}
+ # call the method to ensure the variable gets loaded.
+ sanitized_username &> /dev/null
##############
# set up our event logging file for any notable situation to be recorded in.
if [ -z "$FEISTY_MEOW_EVENT_LOG" ]; then
- define_yeti_variable FEISTY_MEOW_EVENT_LOG="$TMP/$USER-feisty_meow-events.log"
+ define_yeti_variable FEISTY_MEOW_EVENT_LOG="$TMP/$(sanitized_username)-feisty_meow-events.log"
fi
# set up the top-level for all build creations and logs and such.
exit 3
fi
echo "Setting the directory back to user's ownership..."
-sudo chown -R $USER "$SPAM_HOLD"
-sudo chgrp -R $USER "$SPAM_HOLD"
+sudo chown -R $(sanitized_username) "$SPAM_HOLD"
+sudo chgrp -R $(sanitized_username) "$SPAM_HOLD"
echo "Checking for false-positive spams..." | tee "$REPORT_FILE"
bash "$FEISTY_MEOW_SCRIPTS/email/scan_spam.sh" "$SPAM_HOLD" "$EMAIL_WHITE_LIST" 2>&1 \
| tee -a "$REPORT_FILE"
fi;
export outfile="$(mktemp "$TMP/zz_findertmp.XXXXXX")"
# check for files not owned by the user.
-echo "These files are not self-owned by $USER:" >$outfile
+echo "These files are not self-owned by $(sanitized_username):" >$outfile
for i; do
- find $i ! -user $USER >>$outfile
+ find $i ! -user $(sanitized_username) >>$outfile
done
# check for files not in same group as the user.
GROUP="$(groups | awk '{print $1}')"
if [ -z "$process_name" ]; then
return 1 # failure in call.
fi
- OS_PROC_ID=$(ps wuax | grep "[0-9] mono $process_name" | grep -vi screen | sed -e "s/$USER *\([0-9][0-9]*\).*/\1/" | head -n 1)
+ OS_PROC_ID=$(ps wuax | grep "[0-9] mono $process_name" | grep -vi screen | sed -e "s/$(sanitized_username) *\([0-9][0-9]*\).*/\1/" | head -n 1)
}
# takes a screen name for the detached screen session and a process name that
#!/usr/bin/env bash
-main_pid=$( ps wuax | grep "[0-9] mono OpenSim.exe" | grep -vi screen | sed -e "s/$USER *\([0-9][0-9]*\).*/\1/" )
+main_pid=$( ps wuax | grep "[0-9] mono OpenSim.exe" | grep -vi screen | sed -e "s/$(sanitized_username) *\([0-9][0-9]*\).*/\1/" )
if [ ! -z "$main_pid" ]; then
echo Zapping main opensim process with id $main_pid.
#!/usr/bin/env bash
# finds the current user's processes in the process list.
-snuser=$USER
+snuser=$(sanitized_username)
# if the unix variable for the user is not set, try the dos variable.
if [ -z "$snuser" ]; then snuser=$USERNAME; fi
#hmmm: more checks? what else would we get it from, REPLYTO?
user="$1"
if [ -z "$user" ]; then
- user="$USER"
+ user="$(sanitized_username)"
fi
ps wuax | grep $user | awk '{ print $11; }'
# to get past this, TMP gets changed below to a hopefully generic and safe place.
if [[ "$TMP" =~ .:.* ]]; then
log_feisty_meow_event "making weirdo temporary directory for PCDOS-style path."
- export TMP=/tmp/rev_control_$USER
+ export TMP=/tmp/rev_control_$(sanitized_username)
fi
if [ ! -d "$TMP" ]; then
mkdir -p $TMP
export FEISTY_MEOW_APEX="$( \cd "$THISDIR/../.." && \pwd )"
source "$THISDIR/../core/launch_feisty_meow.sh"
continue_on_error "sourcing the feisty meow launcher"
- coolio="$USER"
+ coolio="$(sanitized_username)"
reapply_cool_permissions "$coolio"
continue_on_error "reapplying cool permissions on $coolio"
fi
local combo="$appsdir/$dir"
# go with the default user running the script.
- user_name="$USER"
+ user_name="$(sanitized_username)"
if [ ! -z "$user_name" -a "$user_name" != "root" ]; then
echo "$(date_stringer): Chowning the app folder to be owned by: $user_name" >> "$SSM_LOG_FILE"
#hmmm: have to hope for now for standard group named after user
exit 1
fi
- logdump="$(mktemp /tmp/$USER_logdump.XXXXXX)"
+ logdump="$(mktemp /tmp/$(sanitized_username)_logdump.XXXXXX)"
for logy in ${full_set[*]}; do
#echo logy is $logy
echo "$(date_stringer): --- terminal unlocked" >>$LOG_FILE
clear
-echo "hi $USER, your password has been accepted. enjoy your computer."
+echo "hi $(sanitized_username), your password has been accepted. enjoy your computer."
echo
# commonly used environment variables...
# TEST_TEMP is a folder where we can generate a collection of junk files.
-export TEST_TEMP="$TMP/testkit_logs_${USER}"
+export TEST_TEMP="$TMP/testkit_logs_$(sanitized_username)"
if [ ! -d "$TEST_TEMP" ]; then
mkdir -p "$TEST_TEMP"
fi
projects / feisty_meow.git / commitdiff