Umgang mit Strings verbessert (Support für Dateinamen mit Leerzeichen)
This commit is contained in:
parent
c184ece44e
commit
04eb10fb42
|
@ -1,27 +1,27 @@
|
||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
|
|
||||||
INPUT=$1
|
INPUT="$1"
|
||||||
OUTPUT=$2
|
OUTPUT="$2"
|
||||||
export OW=$3
|
export OW="$3"
|
||||||
export OH=$4
|
export OH="$4"
|
||||||
W=$5
|
W="$5"
|
||||||
if [ "$OW" == "" ]; then OW=0; fi
|
if [ "$OW" == "" ]; then OW=0; fi
|
||||||
if [ "$OH" == "" ]; then OH=0; fi
|
if [ "$OH" == "" ]; then OH=0; fi
|
||||||
OPTIONS="-resize $W -set depth 8 -set colorspace RGB"
|
OPTIONS="-resize $W -set depth 8 -set colorspace RGB"
|
||||||
|
|
||||||
#initial conversion
|
#initial conversion
|
||||||
convert-im6 $OPTIONS $INPUT txt:- | awk -v ow=$OW -v oh=$OH 'match($0, /^([0-9]*),([0-9]*):.*#([0-9A-Fa-f]{6,8}) +r/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " arr[3] }' > $OUTPUT
|
convert-im6 $OPTIONS "$INPUT" txt:- | awk -v ow=i"$OW" -v oh="$OH" 'match($0, /^([0-9]*),([0-9]*):.*#([0-9A-Fa-f]{6,8}) +r/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " arr[3] }' > "$OUTPUT"
|
||||||
|
|
||||||
echo optimizing >&2
|
echo optimizing >&2
|
||||||
|
|
||||||
# edge detection
|
# edge detection
|
||||||
convert-im6 $OPTIONS $INPUT -negate -edge 4 -negate txt:- | awk -v ow=$OW -v oh=$OH 'match($0, /^([0-9]*),([0-9]*):.*#000000/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " }' > /tmp/px6_optimize
|
convert-im6 $OPTIONS "$INPUT" -negate -edge 4 -negate txt:- | awk -v ow="$OW" -v oh="$OH" 'match($0, /^([0-9]*),([0-9]*):.*#000000/, arr ){ print "PX " arr[1]+ow " " arr[2]+oh " " }' > /tmp/px6_optimize
|
||||||
grep -Ff /tmp/px6_optimize $OUTPUT > ${OUTPUT}.tmp
|
grep -Ff /tmp/px6_optimize "$OUTPUT" > "${OUTPUT}.tmp"
|
||||||
grep -Ff /tmp/px6_optimize $OUTPUT >> ${OUTPUT}.tmp
|
grep -Ff /tmp/px6_optimize "$OUTPUT" >> "${OUTPUT}.tmp"
|
||||||
grep -Ff /tmp/px6_optimize $OUTPUT >> ${OUTPUT}.tmp
|
grep -Ff /tmp/px6_optimize "$OUTPUT" >> "${OUTPUT}.tmp"
|
||||||
grep -Ff /tmp/px6_optimize $OUTPUT >> ${OUTPUT}.tmp
|
grep -Ff /tmp/px6_optimize "$OUTPUT" >> "${OUTPUT}.tmp"
|
||||||
cat ${OUTPUT}.tmp >> $OUTPUT
|
cat "${OUTPUT}.tmp" >> "$OUTPUT"
|
||||||
cat $OUTPUT | grep -ve " [a-fA-F0-9]\{6\}00" | shuf > ${OUTPUT}.tmp
|
cat "$OUTPUT" | grep -ve " [a-fA-F0-9]\{6\}00" | shuf > "${OUTPUT}.tmp"
|
||||||
mv ${OUTPUT}.tmp $OUTPUT
|
mv "${OUTPUT}.tmp" "$OUTPUT"
|
||||||
rm /tmp/px6_optimize
|
rm /tmp/px6_optimize
|
||||||
|
|
||||||
|
|
10
px6_send.sh
10
px6_send.sh
|
@ -1,8 +1,8 @@
|
||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
IP=$1
|
IP="$1"
|
||||||
PORT=$2
|
PORT="$2"
|
||||||
PROCS=$3
|
PROCS="$3"
|
||||||
FILE=$4
|
FILE="$4"
|
||||||
PROCMAXTIME=60
|
PROCMAXTIME=60
|
||||||
|
|
||||||
MAINPID=$$
|
MAINPID=$$
|
||||||
|
@ -22,7 +22,7 @@ for i in $(seq 0 $(($PROCS-1))); do
|
||||||
THISPID2=$BASHPID
|
THISPID2=$BASHPID
|
||||||
( sleep $PROCMAXTIME; kill -9 $THISPID2 >/dev/null 2>&1 ) &
|
( sleep $PROCMAXTIME; kill -9 $THISPID2 >/dev/null 2>&1 ) &
|
||||||
echo "starting $(($i+1)) / $PROCS"
|
echo "starting $(($i+1)) / $PROCS"
|
||||||
( while kill -0 $THISPID2; do cat $FILE; done ) | nc $IP $PORT >/dev/null 2>&1
|
( while kill -0 $THISPID2; do cat "$FILE"; done ) | nc "$IP" "$PORT" >/dev/null 2>&1
|
||||||
) >/dev/null 2>&1
|
) >/dev/null 2>&1
|
||||||
done
|
done
|
||||||
) &
|
) &
|
||||||
|
|
Loading…
Reference in New Issue