Fixed issue with --update failing due to quoting

This commit is contained in:
Jeff M. Hubbard 2021-06-21 21:41:01 -05:00 committed by Sebastian Sellmeier
parent 6cc1fc16df
commit 3c76a7ebfe
No known key found for this signature in database
GPG key ID: 51E2BE0CCC826F98

View file

@ -560,13 +560,13 @@ update () {
if [ "$span_image" = true ] || [ ${#DISPLAY_LIST[@]} -lt 2 ]; then if [ "$span_image" = true ] || [ ${#DISPLAY_LIST[@]} -lt 2 ]; then
echof act "Rendering final wallpaper images..." echof act "Rendering final wallpaper images..."
[[ -f "$RES_RESIZE" ]] && cp "$RES_RESIZE" "$CUR_W_RESIZE" [[ -f "$RES_RESIZE" ]] && eval "cp $RES_RESIZE $CUR_W_RESIZE"
[[ -f "$RES_DIM" ]] && cp "$RES_DIM" "$CUR_W_DIM" [[ -f "$RES_DIM" ]] && eval "cp $RES_DIM $CUR_W_DIM"
[[ -f "$RES_BLUR" ]] && cp "$RES_BLUR" "$CUR_W_BLUR" [[ -f "$RES_BLUR" ]] && eval "cp $RES_BLUR $CUR_W_BLUR"
[[ -f "$RES_DIMBLUR" ]] && cp "$RES_DIMBLUR" "$CUR_W_DIMBLUR" [[ -f "$RES_DIMBLUR" ]] && eval "cp $RES_DIMBLUR $CUR_W_DIMBLUR"
[[ -f "$RES_PIXEL" ]] && cp "$RES_PIXEL" "$CUR_W_PIXEL" [[ -f "$RES_PIXEL" ]] && eval "cp $RES_PIXEL $CUR_W_PIXEL"
[[ -f "$RES_DIMPIXEL" ]] && cp "$RES_DIMPIXEL" "$CUR_W_DIMPIXEL" [[ -f "$RES_DIMPIXEL" ]] && eval "cp $RES_DIMPIXEL $CUR_W_DIMPIXEL"
[[ -f "$RES_COLOR" ]] && cp "$RES_COLOR" "$CUR_W_COLOR" [[ -f "$RES_COLOR" ]] && eval "cp $RES_COLOR $CUR_W_COLOR"
else else
echof act "Creating canvas: $TOTAL_SIZE" echof act "Creating canvas: $TOTAL_SIZE"
[[ -f "$RES_RESIZE" ]] && eval "convert -size $TOTAL_SIZE 'xc:blue' $CUR_W_RESIZE" [[ -f "$RES_RESIZE" ]] && eval "convert -size $TOTAL_SIZE 'xc:blue' $CUR_W_RESIZE"
@ -578,13 +578,13 @@ update () {
[[ -f "$RES_COLOR" ]] && eval "convert -size $TOTAL_SIZE 'xc:blue' $CUR_W_COLOR" [[ -f "$RES_COLOR" ]] && eval "convert -size $TOTAL_SIZE 'xc:blue' $CUR_W_COLOR"
echof act "Rendering final wallpaper images..." echof act "Rendering final wallpaper images..."
[[ -f "$CUR_W_RESIZE" ]] && convert "$CUR_W_RESIZE" "$PARAM_RESIZE" "$CUR_W_RESIZE" [[ -f "$CUR_W_RESIZE" ]] && eval "convert $CUR_W_RESIZE $PARAM_RESIZE $CUR_W_RESIZE"
[[ -f "$CUR_W_DIM" ]] && convert "$CUR_W_DIM" "$PARAM_DIM" "$CUR_W_DIM" [[ -f "$CUR_W_DIM" ]] && eval "convert $CUR_W_DIM $PARAM_DIM $CUR_W_DIM"
[[ -f "$CUR_W_BLUR" ]] && convert "$CUR_W_BLUR" "$PARAM_BLUR" "$CUR_W_BLUR" [[ -f "$CUR_W_BLUR" ]] && eval "convert $CUR_W_BLUR $PARAM_BLUR $CUR_W_BLUR"
[[ -f "$CUR_W_DIMBLUR" ]] && convert "$CUR_W_DIMBLUR" "$PARAM_DIMBLUR" "$CUR_W_DIMBLUR" [[ -f "$CUR_W_DIMBLUR" ]] && eval "convert $CUR_W_DIMBLUR $PARAM_DIMBLUR $CUR_W_DIMBLUR"
[[ -f "$CUR_W_PIXEL" ]] && convert "$CUR_W_PIXEL" "$PARAM_PIXEL" "$CUR_W_PIXEL" [[ -f "$CUR_W_PIXEL" ]] && eval "convert $CUR_W_PIXEL $PARAM_PIXEL $CUR_W_PIXEL"
[[ -f "$CUR_W_DIMPIXEL" ]] && convert "$CUR_W_DIMPIXEL" "$PARAM_DIMPIXEL" "$CUR_W_DIMPIXEL" [[ -f "$CUR_W_DIMPIXEL" ]] && eval "convert $CUR_W_DIMPIXEL $PARAM_DIMPIXEL $CUR_W_DIMPIXEL"
[[ -f "$CUR_W_COLOR" ]] && convert "$CUR_W_COLOR" "$PARAM_COLOR" "$CUR_W_COLOR" [[ -f "$CUR_W_COLOR" ]] && eval "convert $CUR_W_COLOR $PARAM_COLOR $CUR_W_COLOR"
fi fi
echof act "Rendering final lockscreen images..." echof act "Rendering final lockscreen images..."
@ -601,13 +601,13 @@ update () {
done done
fi fi
[[ -f "$CUR_W_RESIZE" ]] && convert "$CUR_W_RESIZE" "$PARAM_RECT" "$CUR_L_RESIZE" [[ -f "$CUR_W_RESIZE" ]] && eval "convert $CUR_W_RESIZE $PARAM_RECT $CUR_L_RESIZE"
[[ -f "$CUR_W_DIM" ]] && convert "$CUR_W_DIM" "$PARAM_RECT" "$CUR_L_DIM" [[ -f "$CUR_W_DIM" ]] && eval "convert $CUR_W_DIM $PARAM_RECT $CUR_L_DIM"
[[ -f "$CUR_W_BLUR" ]] && convert "$CUR_W_BLUR" "$PARAM_RECT" "$CUR_L_BLUR" [[ -f "$CUR_W_BLUR" ]] && eval "convert $CUR_W_BLUR $PARAM_RECT $CUR_L_BLUR"
[[ -f "$CUR_W_DIMBLUR" ]] && convert "$CUR_W_DIMBLUR" "$PARAM_RECT" "$CUR_L_DIMBLUR" [[ -f "$CUR_W_DIMBLUR" ]] && eval "convert $CUR_W_DIMBLUR $PARAM_RECT $CUR_L_DIMBLUR"
[[ -f "$CUR_W_PIXEL" ]] && convert "$CUR_W_PIXEL" "$PARAM_RECT" "$CUR_L_PIXEL" [[ -f "$CUR_W_PIXEL" ]] && eval "convert $CUR_W_PIXEL $PARAM_RECT $CUR_L_PIXEL"
[[ -f "$CUR_W_DIMPIXEL" ]] && convert "$CUR_W_DIMPIXEL" "$PARAM_RECT" "$CUR_L_DIMPIXEL" [[ -f "$CUR_W_DIMPIXEL" ]] && eval "convert $CUR_W_DIMPIXEL $PARAM_RECT $CUR_L_DIMPIXEL"
[[ -f "$CUR_W_COLOR" ]] && convert "$CUR_W_COLOR" "$PARAM_RECT" "$CUR_L_COLOR" [[ -f "$CUR_W_COLOR" ]] && eval "convert $CUR_W_COLOR $PARAM_RECT $CUR_L_COLOR"
[[ "$RECTANGLE" ]] && rm "$RECTANGLE" [[ "$RECTANGLE" ]] && rm "$RECTANGLE"
[[ "$DESCRECT" ]] && rm "$DESCRECT" [[ "$DESCRECT" ]] && rm "$DESCRECT"