Merge branch 'master' of git+ssh://gitbox/piccreate
Conflicts: bin/webscan cfg/webscan.cfg libs/CutyCapt/CutyCapt.cpp libs/CutyCapt/CutyCapt.hpp libs/CutyCapt/CutyCapt.o libs/CutyCapt/CutyCapt.pro libs/CutyCapt/Makefile libs/CutyCapt/google.jpg libs/CutyCapt/moc_CutyCapt.cpp libs/CutyCapt/moc_CutyCapt.o libs/CutyCapt/readme.txt
This commit is contained in:
+3
-6
@@ -181,13 +181,10 @@ wait # wait for all processes to finish before exit
|
|||||||
rm $OUTDIR/'beschnitten'/*-[1-9].$FORMAT
|
rm $OUTDIR/'beschnitten'/*-[1-9].$FORMAT
|
||||||
for i in `ls $OUTDIR/'beschnitten'/`
|
for i in `ls $OUTDIR/'beschnitten'/`
|
||||||
do
|
do
|
||||||
echo $i
|
first=`basename $i -0.jpg`
|
||||||
bla=`basename $i -0.jpg`
|
second=`basename $first .jpg`
|
||||||
blubb=`basename $bla .jpg`
|
mv $OUTDIR/'beschnitten'/$i $OUTDIR/'beschnitten'/$second.jpg
|
||||||
|
|
||||||
echo $blubb
|
|
||||||
mv $OUTDIR/'beschnitten'/$i $OUTDIR/'beschnitten'/$blubb.jpg
|
|
||||||
# Löscht den verschnitt aus dem output-ordner
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 0 B |
Reference in New Issue
Block a user