OSDN Git Service

Fixed a bug that the loops didn't work.
authorMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Mon, 10 Sep 2018 05:43:21 +0000 (13:43 +0800)
committerMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Mon, 10 Sep 2018 05:43:21 +0000 (13:43 +0800)
 Changes to be committed:
modified:   lib/libmain.sh
modified:   lib/libprogram.sh

lib/libmain.sh
lib/libprogram.sh

index 369d113..20ea689 100644 (file)
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180910125713
+       MYVERSION=4.0.0+toward_4.1.0_20180910134301
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 
index d4e1d2f..4e9f904 100644 (file)
@@ -174,7 +174,7 @@ program_exec_restartable_loop_operation ()
                iline=$(($iline+1))
                PROGRAM_STEP_PROGRESS=$(($PROGRAM_STEP_PROGRESS+1))
                PROGRAM_STEP_COUNTER="[$PROGRAM_STEP_PROGRESS/$PROGRAM_NUM_STEPS $(($PROGRAM_STEP_PROGRESS*100/$PROGRAM_NUM_STEPS))%]"
-               if grep -vq -Fx "$item" "$looplist.remain" 2> /dev/null
+               if ! grep -q -Fx "$item" "$looplist.remain" 2> /dev/null
                then
                        [ $iline -gt $nlines ] && PROGRAM_STEP_COUNTER_LAST_SKIPPED=yes
                        continue