X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=8c9c0b2aceaa64699457f5ba2ace684dbddb6fe9;hb=49d903f63b2681d0fd062a577c42a9d3678a3c08;hp=28c2f05822fc851b0f0025cc09147ef806bdde43;hpb=714f07e34483e14aa4a91047b8891463267ae568;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 28c2f058..8c9c0b2a 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -225,7 +225,8 @@ if [ -z "$skip_all" ]; then # local oldterm="$TERM" # export TERM=linux - /usr/bin/ssh -Y -C "${args[@]}" + /usr/bin/ssh -C "${args[@]}" +# removed -Y flag because considered dangerous to trust remote hosts to not abuse our X session. # # restore the terminal variable also. # TERM="$oldterm" @@ -949,9 +950,11 @@ 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\|txt\|vsd\|vsdx\|xls\|xlsx\|xml\|zip" | \ +"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/$/"/' | \ xargs bash "$FEISTY_MEOW_SCRIPTS/files/spacem.sh" # drop the temp file now that we're done.