s83/user.js
1
0
Fork 0
mirror of https://github.com/arkenfox/user.js.git synced 2025-05-03 23:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updater.sh argument fixes

Browse source
This commit is contained in:
overdodactyl 2018-11-20 11:34:11 -07:00
parent afbeff7e85
commit 25f6c336a9
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
updater.sh
View file

@ -108,9 +108,13 @@ if [ $# != 0 ]; then
MINIFY="true" MINIFY="true"
;; ;;
\?) \?)
echo -e ${RED}"\nInvalid option: -$OPTARG"${NC} >&2 echo -e ${RED}"\n Error! Invalid option: -$OPTARG"${NC} >&2
usage usage
;; ;;
:)
echo -e ${RED}"Error! Option -$OPTARG requires an argument."${NC} >&2
exit 1
;;
esac esac
done done
fi fi
@ -164,12 +168,11 @@ download_file () {
backup_file () { backup_file () {
filename=$1 filename=$1
mkdir -p userjs_backups mkdir -p userjs_backups
bakname="userjs_backups/${filename}.backup.$(date +"%Y-%m-%d_%H%M")"
if [ $BACKUP = "single" ]; then if [ $BACKUP = "single" ]; then
cd userjs_backups bakname="userjs_backups/${filename}.backup"
find . -type f -name $filename\* -exec rm {} \;
cd ..
fi fi
mv $filename "userjs_backups/${filename}.backup.$(date +"%Y-%m-%d_%H%M")" mv $filename $bakname
mv "userjs_temps/${filename}" $filename mv "userjs_temps/${filename}" $filename
echo -e "Status: ${GREEN}${filename} has been backed up and replaced with the latest version!${NC}" echo -e "Status: ${GREEN}${filename} has been backed up and replaced with the latest version!${NC}"
} }
@ -254,7 +257,7 @@ update_updater () {
# Backup current updater, execute latest version # Backup current updater, execute latest version
backup_file updater.sh backup_file updater.sh
chmod +x updater.sh chmod +x updater.sh
./updater.sh "$@" ./updater.sh "$@ -d"
exit 1 exit 1
} }
@ -273,26 +276,27 @@ add_override () {
input=$1 input=$1
if [ -f "$input" ]; then if [ -f "$input" ]; then
echo "" >> user.js echo "" >> user.js
cat $input >> user.js cat "$input" >> user.js
echo -e "Status: ${GREEN}Override file appended:${NC} ${input}" echo -e "Status: ${GREEN}Override file appended:${NC} ${input}"
elif [ -d "$input" ]; then elif [ -d "$input" ]; then
FILES=${input}/* FILES="${input}/*"
for f in $FILES for f in $FILES
do do
add_override $f echo "$f"
add_override "$f"
done done
else else
echo -e "${ORANGE}Warning: Could not find override file:${NC} ${OVERRIDE}" echo -e "${ORANGE}Warning: Could not find override file:${NC} ${input}"
fi fi
} }
# Applies latest version of user.js and any custom overrides # Applies latest version of user.js and any custom overrides
update_userjs () { update_userjs () {
backup_file user.js backup_file user.js
if [ $OVERRIDE != "none" ]; then if [ "$OVERRIDE" != "none" ]; then
IFS=',' read -ra FILES <<< "$OVERRIDE" IFS=',' read -ra FILES <<< "$OVERRIDE"
for i in "${FILES[@]}"; do for i in "${FILES[@]}"; do
add_override $i add_override "$i"
done done
fi fi
} }
@ -306,8 +310,6 @@ remove_comments () {
cat userjs_temps/content.js >> userjs_temps/no_comments.js cat userjs_temps/content.js >> userjs_temps/no_comments.js
# cat user.js >> userjs_temps/no_comments.js # cat user.js >> userjs_temps/no_comments.js
mv userjs_temps/no_comments.js user.js mv userjs_temps/no_comments.js user.js
else
return 0
fi fi
} }