Kasiandra/pimo-scripts
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix

Browse source
This commit is contained in:
elektroll 2018-08-11 20:43:31 +02:00
parent 3b7c0d54b2
commit 89f1295eb4
5 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
effects/Vignette-2.sh
View file

@ -1,6 +1,2 @@
#!/bin/bash
<<<<<<< HEAD
composite -gravity center -resize 1251x1039 /home/pi/effects/grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
=======
composite -gravity center -resize 3908x2602 grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690