jan/.dotfiles
1
0
Fork 0
mirror of https://github.com/JanJastrow/.dotfiles.git synced 2024-11-25 03:42:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge conflict

Browse Source
This commit is contained in:
Jan Jastrow 2023-10-20 16:45:16 +02:00
parent a24bc69e8c
commit 0f565c47f5
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zsh/scripts
View File

@ -49,11 +49,7 @@ function pushover() {
https://api.pushover.net/1/messages.json https://api.pushover.net/1/messages.json
} }
<<<<<<< HEAD
# png to jpg 95
=======
# png to jpg 85 # png to jpg 85
>>>>>>> parent of d1425c4 (Increase jpg quality)
function png2web() { function png2web() {
findpath=$1 findpath=$1
: "${findpath:="."}" : "${findpath:="."}"
@ -61,11 +57,7 @@ function png2web() {
dir=$(dirname "$f"); dir=$(dirname "$f");
file=$(basename "$f"); file=$(basename "$f");
name="${file%.*}"; name="${file%.*}";
<<<<<<< HEAD
magick convert "$f" pnm:- | cjpeg -progressive -quality 95 > "$dir/$name.jpg" </dev/null
=======
magick convert "$f" pnm:- | cjpeg -progressive -quality 85 > "$dir/$name.jpg" </dev/null magick convert "$f" pnm:- | cjpeg -progressive -quality 85 > "$dir/$name.jpg" </dev/null
>>>>>>> parent of d1425c4 (Increase jpg quality)
rm -f "$f"; rm -f "$f";
done done
} }