diff --git a/windows/scripts/build-slapos.sh b/windows/scripts/build-slapos.sh index bd44394648609608ae23ab1a2233c6d5c9c87b9f..02baf772ce18744ed4bff5080248f817ff478b0a 100755 --- a/windows/scripts/build-slapos.sh +++ b/windows/scripts/build-slapos.sh @@ -43,7 +43,7 @@ if [[ -f $patch_file ]] ; then for x in $(find $slapos_home/eggs -name slapos.core-*.egg ; do echo Patching $x ... cd $x - patch --dry-run -p1 < $patch_file && patch -p1 < $patch_file && echo Patch $x OK. + patch -f --dry-run -p1 < $patch_file > /dev/null && patch -p1 < $patch_file && echo Patch $x OK. done fi diff --git a/windows/scripts/slapos-configure.sh b/windows/scripts/slapos-configure.sh index bdd0472f95f421897a34111a9c334bc49fc36376..dc65634e7096b21ac69d6516f35b90c31e72cfef 100755 --- a/windows/scripts/slapos-configure.sh +++ b/windows/scripts/slapos-configure.sh @@ -468,7 +468,6 @@ done #------------------------------------------------- slaprunner_title="SlapOS-Node-Runner-In-$computer_id" - grep -q "window.location.href" $slapos_runner_file if (( $? )) ; then echo @@ -487,7 +486,7 @@ if (( $? )) ; then echo "Supply $slaprunner_cfg in the computer $computer_id" /opt/slapos/bin/slapos supply $slaprunner_cfg $computer_id - echo "Request an instance 'Node Runner' ..." + echo "Request an instance $slaprunner_title ..." while true ; do /opt/slapos/bin/slapos node software --verbose /opt/slapos/bin/slapos node instance --verbose @@ -530,7 +529,7 @@ EOF for x in $(find /opt/slapgrid/ -name slapos.cookbook-*.egg) ; do echo Apply to $x cd $x - patch --dry-run -p1 < $patch_file && patch -p1 < $patch_file + patch -f --dry-run -p1 < $patch_file > /dev/null && patch -p1 < $patch_file done fi echo