Skip to content

Commit 735d90f

Browse files
Merge pull request #303 from Martinski4GitHub/dev
Some cleanup.
2 parents 9bfd0a3 + 384b61c commit 735d90f

1 file changed

Lines changed: 0 additions & 36 deletions

File tree

MerlinAU.sh

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,6 @@ readonly cronJobsRegEx5="[[:blank:]]+${USB_MNT_DIRPATH1}/.* "
9494
readonly cronJobsRegEx6="[[:blank:]]+${USB_MNT_DIRPATH2}/.* "
9595
readonly addonCronJobList="/home/root/addonCronJobList_$$.txt"
9696

97-
##FOR TESTING/DEBUG ONLY##
98-
debugAddOnCronJobsList=false
99-
##Set to 'false' for Production Release ##
100-
[ "$SCRIPT_BRANCH" = "master" ] && debugAddOnCronJobsList=false
101-
readonly restoreAddOnCronJobList="${SETTINGS_DIR}/restoreAddOnCronJobs.sh"
102-
##FOR TESTING/DEBUG ONLY##
103-
10497
##----------------------------------------##
10598
## Modified by Martinski W. [2024-Jun-05] ##
10699
##----------------------------------------##
@@ -5131,17 +5124,6 @@ _RemoveCronJobsFromAddOns_()
51315124
return 1
51325125
fi
51335126

5134-
##FOR TESTING/DEBUG ONLY##
5135-
if "$debugAddOnCronJobsList"
5136-
then
5137-
{
5138-
echo "#!/bin/sh"
5139-
echo "# Created by ${SCRIPT_NAME} #"
5140-
echo "#"
5141-
} > "$restoreAddOnCronJobList"
5142-
fi
5143-
##FOR TESTING/DEBUG ONLY##
5144-
51455127
local cronJobCount=0 cronJobIDx cronJobCMD
51465128

51475129
while read -r cronJobLINE
@@ -5162,29 +5144,11 @@ _RemoveCronJobsFromAddOns_()
51625144
else Say "Cron job [$cronJobIDx] was removed successfully."
51635145
fi
51645146
fi
5165-
5166-
##FOR TESTING/DEBUG ONLY##
5167-
if "$debugAddOnCronJobsList" && [ -n "$cronJobIDx" ]
5168-
then
5169-
{
5170-
printf "cru a $cronJobIDx \"${cronJobCMD}\"\n"
5171-
} >> "$restoreAddOnCronJobList"
5172-
fi
5173-
##FOR TESTING/DEBUG ONLY##
5174-
51755147
done < "$addonCronJobList"
51765148

51775149
rm -f "$addonCronJobList"
51785150
Say "Cron jobs [$cronJobCount] from 3rd-party add-ons were removed."
51795151

5180-
##FOR TESTING/DEBUG ONLY##
5181-
if "$debugAddOnCronJobsList"
5182-
then
5183-
echo "#EOF#" >> "$restoreAddOnCronJobList"
5184-
chmod 755 "$restoreAddOnCronJobList"
5185-
fi
5186-
##FOR TESTING/DEBUG ONLY##
5187-
51885152
sleep 5
51895153
return 0
51905154
}

0 commit comments

Comments
 (0)