**v2021.9.3 (202109030)**

- Fixed "boot schedules not working" (thanks, @rhayy) - Updated config examples
VR-25 · Sep 3, 2021 · e620084 · e620084
1 parent 9a8d2c2
commit e620084
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 47 deletions.
diff --git a/README.html b/README.html
@@ -106,23 +106,24 @@ <h2 id="prerequisites">PREREQUISITES</h2>
 <p>Other executables or static binaries can also be placed in /data/adb/vr25/bin/ (with proper permissions) instead of being installed system-wide.</p>
 <hr>
 <h2 id="configuration-dataadbvr25djs-dataconfigtxt">CONFIGURATION (/data/adb/vr25/djs-data/config.txt)</h2>
-<pre><code><code><div>// This is a comment line
+<pre><code><code><div># This is a comment line.
+# All lines that do not match a schedule instruction are ignored, regardless of the '#'.
 
-// This is used to determine whether config should be patched. Do NOT modify!
+# This is used to determine whether this file should be patched. Do NOT modify!
 versionCode=201908180
 
-// Schedule Examples
+# Schedule Examples
 
-// Run on boot
-// boot touch /data/I-was-born-on-boot; : --delete
-// &quot;: --delete&quot; is optional; it means &quot;delete the schedule after execution&quot; - effectively turning it into a one-time boot schedule.
+# Run on boot
+#boot touch /data/I-was-born-on-boot; : --delete
+# &quot;: --delete&quot; is optional; it means &quot;delete the schedule after execution&quot; - effectively turning it into a one-time boot schedule.
 
-// Apply Advanced Charging Controller night settings at 22:00
-//2200 acc 45 44 &amp;&amp; acc --set applyOnPlug usb/current_max:500000
+# Apply Advanced Charging Controller night settings at 22:00
+#2200 acc pc=45 rc=44 mcc=500000 mcv=3920
 
-// Restore regular ACC settings at 6:00 (morning)
-//0600 acc 80 70 &amp;&amp; acc -s applyOnPlug 2000000; : --boot
-// &quot;: --boot&quot; is optional; it lets this schedule run on boot as well (fail-safe).
+# Restore regular ACC settings at 6:00 (morning)
+#0600 acc pc=75 rc=70 mcc= mcv=; : --boot
+# &quot;: --boot&quot; is optional; it makes this schedule run on boot as well (e.g., as part of a fail-safe plan).
 </div></code></code></pre>
 <hr>
 <h2 id="usage">USAGE</h2>
@@ -230,11 +231,6 @@ <h2 id="links">LINKS</h2>
 </ul>
 <hr>
 <h2 id="latest-changes">LATEST CHANGES</h2>
-<p><strong>v2021.8.9.1 (202108091)</strong></p>
-<ul>
-<li>Rewritten daemon logic for better efficiency and reliability.</li>
-<li>Updated documentation</li>
-</ul>
 <p><strong>v2021.8.23 (202108230)</strong></p>
 <ul>
 <li>-L|--log [cmd] (default cmd: tail -F), djsd generates verbose (/dev/.vr25/djs/djsd.log).</li>
@@ -246,6 +242,11 @@ <h2 id="latest-changes">LATEST CHANGES</h2>
 <ul>
 <li>Fixed daemon startup issue.</li>
 <li>Updated framework (it uses acc's) and documentation</li>
+</ul>
+<p><strong>v2021.9.3 (202109030)</strong></p>
+<ul>
+<li>Fixed &quot;boot schedules not working&quot; (thanks, @rhayy)</li>
+<li>Updated config examples</li>
 </ul>
 
     </body>

diff --git a/README.md b/README.md
@@ -91,23 +91,24 @@ Other executables or static binaries can also be placed in /data/adb/vr25/bin/ (
 ## CONFIGURATION (/data/adb/vr25/djs-data/config.txt)
 
 ```
-// This is a comment line
+# This is a comment line.
+# All lines that do not match a schedule instruction are ignored, regardless of the '#'.
 
-// This is used to determine whether config should be patched. Do NOT modify!
+# This is used to determine whether this file should be patched. Do NOT modify!
 versionCode=201908180
 
-// Schedule Examples
+# Schedule Examples
 
-// Run on boot
-// boot touch /data/I-was-born-on-boot; : --delete
-// ": --delete" is optional; it means "delete the schedule after execution" - effectively turning it into a one-time boot schedule.
+# Run on boot
+#boot touch /data/I-was-born-on-boot; : --delete
+# ": --delete" is optional; it means "delete the schedule after execution" - effectively turning it into a one-time boot schedule.
 
-// Apply Advanced Charging Controller night settings at 22:00
-//2200 acc 45 44 && acc --set applyOnPlug usb/current_max:500000
+# Apply Advanced Charging Controller night settings at 22:00
+#2200 acc pc=45 rc=44 mcc=500000 mcv=3920
 
-// Restore regular ACC settings at 6:00 (morning)
-//0600 acc 80 70 && acc -s applyOnPlug 2000000; : --boot
-// ": --boot" is optional; it lets this schedule run on boot as well (fail-safe).
+# Restore regular ACC settings at 6:00 (morning)
+#0600 acc pc=75 rc=70 mcc= mcv=; : --boot
+# ": --boot" is optional; it makes this schedule run on boot as well (e.g., as part of a fail-safe plan).
 ```
 
 ---
@@ -242,12 +243,6 @@ Always provide as much information as possible.
 ## LATEST CHANGES
 
 
-**v2021.8.9.1 (202108091)**
-
-- Rewritten daemon logic for better efficiency and reliability.
-- Updated documentation
-
-
 **v2021.8.23 (202108230)**
 
 - -L|--log [cmd] (default cmd: tail -F), djsd generates verbose (/dev/.vr25/djs/djsd.log).
@@ -260,3 +255,9 @@ Always provide as much information as possible.
 
 - Fixed daemon startup issue.
 - Updated framework (it uses acc's) and documentation
+
+
+**v2021.9.3 (202109030)**
+
+- Fixed "boot schedules not working" (thanks, @rhayy)
+- Updated config examples
diff --git a/djs/default-config.txt b/djs/default-config.txt
@@ -1,17 +1,18 @@
-// This is a comment line
+# This is a comment line.
+# All lines that do not match a schedule instruction are ignored, regardless of the '#'.
 
-// This is used to determine whether config should be patched. Do NOT modify!
+# This is used to determine whether this file should be patched. Do NOT modify!
 versionCode=201908180
 
-// Schedule Examples
+# Schedule Examples
 
-// Run on boot
-// boot touch /data/I-was-born-on-boot; : --delete
-// ": --delete" is optional; it means "delete the schedule after execution" - effectively turning it into a one-time boot schedule.
+# Run on boot
+#boot touch /data/I-was-born-on-boot; : --delete
+# ": --delete" is optional; it means "delete the schedule after execution" - effectively turning it into a one-time boot schedule.
 
-// Apply Advanced Charging Controller night settings at 22:00
-//2200 acc 45 44 && acc --set applyOnPlug usb/current_max:500000
+# Apply Advanced Charging Controller night settings at 22:00
+#2200 acc pc=45 rc=44 mcc=500000 mcv=3920
 
-// Restore regular ACC settings at 6:00 (morning)
-//0600 acc 80 70 && acc -s applyOnPlug 2000000; : --boot
-// ": --boot" is optional; it lets this schedule run on boot as well (fail-safe).
+# Restore regular ACC settings at 6:00 (morning)
+#0600 acc pc=75 rc=70 mcc= mcv=; : --boot
+# ": --boot" is optional; it makes this schedule run on boot as well (e.g., as part of a fail-safe plan).
diff --git a/djs/djs.sh b/djs/djs.sh
@@ -77,7 +77,7 @@ ln -sf $execDir/djs-version.sh /dev/djs-version
 # boot schedules
 if [ ! -f $tmpDir/djsd-boot.sh ]; then
   echo "#!/system/bin/sh" > $tmpDir/djsd-boot.sh
-  grep '^boot | : --boot' $config | sed 's/^.... //' >> $tmpDir/djsd-boot.sh
+  grep -E '^boot | : --boot' $config | sed 's/^.... //' >> $tmpDir/djsd-boot.sh
   echo 'exit $?' >> $tmpDir/djsd-boot.sh
   chmod u+x $tmpDir/djsd-boot.sh
   start-stop-daemon -bx $tmpDir/djsd-boot.sh -S --

diff --git a/module.prop b/module.prop
@@ -1,6 +1,6 @@
 id=djs
 name=Daily Job Scheduler (DJS)
-version=v2021.8.26
-versionCode=202108260
+version=v2021.9.3
+versionCode=202109030
 author=VR25
 description=Runs commands and scripts on boot and at HH:MM. Any root solution is supported. The installation is always "system-less", whether or not the system is rooted with Magisk.