X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=8ad72ccf0aae36683981105e1c14383bf042c0a3;hb=26afb709329d63e6d4aaf2cbae22bc80c9a11633;hp=a2b28bddeccc72ec056c5d564df0753af9c708fa;hpb=8589b1b8838ad0bca0b28626d810770bd5fb563c;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index a2b28bdd..8ad72ccf 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -466,9 +466,9 @@ if [ -z "$skip_all" ]; then # launch sudo with just the variables we want to reach the other side. local varmods= -# varmods+="PATH= " + varmods+="OLD_HOME=$HOME " if [ ! -z "$IMPORTED_XAUTH" ]; then varmods+="IMPORTED_XAUTH=$IMPORTED_XAUTH "; fi - if [ ! -z "$SSH_AUTH_SOCK" ]; then varmods+="SSH_AUTH_SOCK=$SSH_AUTH_SOCK"; fi + if [ ! -z "$SSH_AUTH_SOCK" ]; then varmods+="SSH_AUTH_SOCK=$SSH_AUTH_SOCK "; fi /usr/bin/sudo $varmods "$@" retval=$? @@ -950,7 +950,9 @@ return 0 local charnfile="$(mktemp $TMP/zz_charn.XXXXXX)" #hmmm: any way to do the below more nicely or reusably? - find "${dirs[@]}" -follow -maxdepth 1 -mindepth 1 -type f | \ +#hmmm: yes! a variable with a list of files that are considered TEXT_FILE_EXTENSIONS or something like that. +#hmmm: yes continued! also a variable for BINARY_FILE_EXTENSIONS to avoid those, where we need to in other scripts. + find "${dirs[@]}" -follow -maxdepth 1 -mindepth 1 -type f -and -not -iname ".[a-zA-Z0-9]*" | \ grep -i \ "csv\|doc\|docx\|eml\|html\|jpeg\|jpg\|m4a\|mov\|mp3\|ods\|odt\|pdf\|png\|ppt\|pptx\|rtf\|txt\|vsd\|vsdx\|xls\|xlsx\|xml\|zip" | \ sed -e 's/^/"/' | sed -e 's/$/"/' | \