templatectl: Add/Remove items from templates.json via cli

package/draft/package

@@ -5,7 +5,7 @@
 pkgnames=(draft)
 pkgdesc="Launcher which wraps around the standard interface"
 url=https://github.com/dixonary/draft-reMarkable
-pkgver=0.2.0-17
+pkgver=0.2.0-18
 timestamp=2020-07-20T10:23Z
 section="launchers"
 maintainer="Mattéo Delabre <[email protected]>"

package/oxide/package

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 pkgnames=(erode fret oxide rot tarnish decay)
-pkgver=2.1~beta-2
+pkgver=2.1~beta-3
 timestamp=2021-01-07T03:28Z
 maintainer="Eeems <[email protected]>"
 license=MIT

package/reboot-guard/package

@@ -5,7 +5,7 @@
 pkgnames=(reboot-guard)
 pkgdesc="Block systemd-initiated poweroff/reboot/halt until configurable condition checks pass"
 url=https://github.com/stephanritscher/reboot-guard
-pkgver=1.0.1-5
+pkgver=1.0.1-6
 timestamp=2020-05-04T06:16Z
 section="devel"
 maintainer="Eeems <[email protected]>"

package/rmkit/package

@@ -27,7 +27,7 @@ build() {
 genie() {
     pkgdesc="Gesture engine that connects commands to gestures"
     url="https://rmkit.dev/apps/genie"
-    pkgver=0.1.2-1
+    pkgver=0.1.2-2
     section="utils"
 
     package() {
@@ -98,7 +98,7 @@ nao() {
 remux() {
     pkgdesc="App launcher that supports multi-tasking applications"
     url="https://rmkit.dev/apps/remux"
-    pkgver=0.1.7-1
+    pkgver=0.1.7-2
     section="launchers"
 
     package() {

package/template-cartesian-graph/package

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(template-cartesian-graph)
+pkgdesc="Cartesian graph template"
+url=https://github.com/PeterGrace/template-cartesian-graph
+pkgver=1.0.0-4
+timestamp=2021-01-14T17:46Z
+section="templates"
+maintainer="Peter Grace <[email protected]>"
+license=MIT
+depends=(templatectl)
+
+source=("https://github.com/PeterGrace/template-cartesian-graph/archive/v${pkgver%-*}.zip")
+sha256sums=(d3215546c6fd709bb5988b7042ce5fb990d9a030d783ed7505fcc2dbedbc0e0f)
+
+package() {
+    install -D -m 755 -t "$pkgdir"/opt/share/remarkable/templates \
+        "$srcdir"/template-cartesian-graph.png
+    install -D -m 755 -t "$pkgdir"/opt/share/remarkable/templates \
+        "$srcdir"/template-cartesian-graph.svg
+}
+
+configure() {
+    templatectl add --name "Cartesian Graph" --filename "template-cartesian-graph" \
+        --category "Custom" --category "Math"
+}
+
+preremove() {
+    templatectl remove --name "Cartesian Graph"
+}
+
+preupgrade() {
+    templatectl remove --name "Cartesian Graph"
+}

package/templatectl/package

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(templatectl)
+pkgdesc="Tool to add/remove templates for xochitl"
+url=https://github.com/PeterGrace/templatectl
+pkgver=0.1.2-3
+timestamp=2021-01-15T01:23Z
+section="templates"
+maintainer="Peter Grace <[email protected]>"
+license=MIT
+
+image=rust:v1.2.2
+source=(
+    "https://github.com/PeterGrace/templatectl/archive/v${pkgver%-*}.zip"
+    usr-share-remarkable-templates.mount
+)
+sha256sums=(
+    305e3dbf29aea7f762fba22ceebfa004a5f666ae96fdb8776b2acfdb39539469
+    SKIP
+)
+
+build() {
+    cargo build --release
+}
+
+package() {
+    install -D -m 755 -t "$pkgdir"/opt/bin \
+        "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/templatectl
+    install -D -t "$pkgdir"/lib/systemd/system "$srcdir"/usr-share-remarkable-templates.mount
+}
+
+preinstall() {
+    local target_path=share/remarkable/templates
+    if [ ! -d /home/root/.entware/"$target_path" ]; then
+        mkdir -p /home/root/.entware/"$target_path"
+        cp -r /usr/"$target_path"/* /home/root/.entware/"$target_path"
+    fi
+}
+
+postupgrade() {
+    systemctl stop usr-share-remarkable-templates.mount
+}
+
+configure() {
+    systemctl daemon-reload
+    systemctl enable --now usr-share-remarkable-templates.mount
+    echo "If you perform a system upgrade that adds new templates"
+    echo "Manual intervention may be required to handle adding the new templates"
+}
+
+preremove() {
+    systemctl disable --now usr-share-remarkable-templates.mount
+}
+
+postremove() {
+    systemctl daemon-reload
+    echo "To fully remove templatectl you'll need to run the following command:"
+    echo "  rm -rf /home/root/.entware/share/remarkable/templates"
+}

package/templatectl/usr-share-remarkable-templates.mount

@@ -0,0 +1,14 @@
+[Unit]
+Description=Bind mount /opt/share/remarkable/templates over /usr/share/remarkable/templates
+DefaultDependencies=no
+Conflicts=umount.target
+Before=local-fs.target umount.target
+
+[Mount]
+What=/home/root/.entware/share/remarkable/templates
+Where=/usr/share/remarkable/templates
+Type=none
+Options=bind
+
+[Install]
+WantedBy=local-fs.target

scripts/package-build

@@ -228,7 +228,7 @@ SCRIPT
             for step in pre post; do
                 if [[ $(type -t "$step"upgrade) = function ]] \
                     || [[ $(type -t "$step"remove) = function ]] \
-                    || [ -d "$pkgdir"/opt/usr/share/applications ] && [ $step = post ]; then
+                    || { [ -d "$pkgdir"/opt/usr/share/applications ] && [ $step = post ]; }; then
                     {
                         maintainer-script-header