Call update-desktop-database to refresh Oxide's application cache on …

…install (#700) * Update oxide to v2.6 * Style fixes * Add missing pkgnames * Update image paths * Fix liboxide path * Don't check to see if tarnish is active update-desktop-database safely handles tarnish not running. * update-desktop-database for all applicaitons * Update build image for plato * Re-trigger CI Most likely a one-off error: Timeout when connecting to github * Update to latest image for zoneinfo-utils * Add libc6 build dependency to zoneinfo-utils * Revert all changes to zoneinfo-utils * Update all packages to use install-lib method * Fix formatting * Also run oxide hook for draft apps * Remove manual reload-oxide-apps calls * Bump all other packages that have draft/oxide files * Format fixes * Add back missing documentation change * Don't update whiteboard-hypercard This package is failing to build * Revert folly version * Bump whiteboard-hypercard now that the build is fixed * Bump xochitl version number * Use github for KOReader release --------- Co-authored-by: Linus <[email protected]> Co-authored-by: Jayy001 <[email protected]>
toltec-dev · Nov 23, 2023 · ee79e99 · ee79e99
1 parent 5fc766d
commit ee79e99
Show file tree

Hide file tree

Showing 27 changed files with 51 additions and 60 deletions.
diff --git a/docs/package.md b/docs/package.md
@@ -440,3 +440,12 @@ When upgrading a package from version A to B, the following happens:
 * `postupgrade B`, if it exists, is called from version A
 * New package files are unpacked and installed
 * `configure`, if it exists, is called from version B
+
+
+### reload-oxide-apps hook
+
+If a package contains one or more files in `/opt/etc/draft` or `/opt/usr/share/applications` the `reload-oxide-apps` method in `install-lib` will be appended to the following:
+
+* `configure`
+* `postupgrade`
+* `postremove`
diff --git a/package/calculator/package b/package/calculator/package
@@ -5,7 +5,7 @@
 pkgnames=(calculator)
 pkgdesc="Touch-based calculator"
 url=https://github.com/reHackable/Calculator
-pkgver=0.0.0-15
+pkgver=0.0.0-16
 timestamp=2020-08-20T12:28Z
 section="math"
 maintainer="Mattéo Delabre <[email protected]>"

diff --git a/package/chessmarkable/package b/package/chessmarkable/package
@@ -5,7 +5,7 @@
 pkgnames=(chessmarkable)
 pkgdesc="Chess game"
 url=https://github.com/LinusCDE/chessmarkable
-pkgver=0.8.0-1
+pkgver=0.8.0-2
 timestamp=2021-07-22T12:04Z
 section="games"
 maintainer="Linus K. <[email protected]>"

diff --git a/package/doomarkable/package b/package/doomarkable/package
@@ -5,7 +5,7 @@
 pkgnames=(doomarkable)
 pkgdesc="DOOM game"
 url=https://github.com/LinusCDE/doomarkable
-pkgver=0.4.1-1
+pkgver=0.4.1-2
 timestamp=2021-10-31T16:15Z
 section="games"
 maintainer="Linus K. <[email protected]>"

diff --git a/package/fingerterm/package b/package/fingerterm/package
@@ -5,7 +5,7 @@
 pkgnames=(fingerterm)
 pkgdesc="Terminal emulator with an on-screen touch keyboard"
 url=https://github.com/dixonary/fingerterm-reMarkable
-pkgver=1.3.5-14
+pkgver=1.3.5-15
 timestamp=2020-10-27T12:02Z
 section="admin"
 maintainer="Mattéo Delabre <[email protected]>"

diff --git a/package/keywriter/package b/package/keywriter/package
@@ -5,7 +5,7 @@
 pkgnames=(keywriter)
 pkgdesc="Markdown-enabled free writing app"
 url=https://github.com/dps/remarkable-keywriter
-pkgver=0.2~20-gddc9e73-1
+pkgver=0.2~20-gddc9e73-2
 timestamp=2022-02-09T07:05:03Z
 section="writing"
 maintainer="Mattéo Delabre <[email protected]>"

diff --git a/package/koreader/package b/package/koreader/package
@@ -5,7 +5,7 @@
 pkgnames=(koreader)
 pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
 url=https://github.com/koreader/koreader
-pkgver=2023.08-1
+pkgver=2023.08-2
 timestamp=2023-08-29T16:21:01Z
 section="readers"
 maintainer="raisjn <[email protected]>"
@@ -14,7 +14,7 @@ installdepends=(fbink fbdepth display rm2fb-client)
 
 _srcver="v${pkgver%-*}"
 source=(
-    "https://build.koreader.rocks/download/stable/$_srcver/koreader-remarkable-$_srcver.zip"
+    "https://github.com/koreader/koreader/releases/download/$_srcver/koreader-remarkable-$_srcver.zip"
     koreader.draft
     KOReader.oxide
     koreader-toltec.service

diff --git a/package/netsurf/package b/package/netsurf/package
@@ -5,7 +5,7 @@
 pkgnames=(netsurf)
 pkgdesc="Lightweight web browser"
 url=https://github.com/alex0809/netsurf-reMarkable
-pkgver=0.4.0-2
+pkgver=0.4.0-3
 timestamp=2021-05-31T11:15+00:00
 maintainer="Alex Friesenhahn <[email protected]>"
 archs=(rmall)

diff --git a/package/oxide/package b/package/oxide/package
@@ -49,10 +49,6 @@ fret() {
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/fret
         install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.fret.oxide
     }
-
-    configure() {
-        update-desktop-database
-    }
 }
 
 oxide() {
@@ -66,9 +62,6 @@ oxide() {
         install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.oxide.oxide
         install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/oxide.png
     }
-    configure() {
-        update-desktop-database
-    }
 }
 
 rot() {
@@ -128,10 +121,6 @@ decay() {
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/decay
         install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.decay.oxide
     }
-
-    configure() {
-        update-desktop-database
-    }
 }
 corrupt() {
     pkgdesc="Task Switcher for Oxide"
@@ -142,10 +131,6 @@ corrupt() {
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/corrupt
         install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide
     }
-
-    configure() {
-        update-desktop-database
-    }
 }
 
 anxiety() {
@@ -159,10 +144,6 @@ anxiety() {
         install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps "$srcdir"/release/opt/usr/share/icons/oxide/48x48/apps/image.png
         install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/anxiety.png
     }
-
-    configure() {
-        update-desktop-database
-    }
 }
 
 oxide-utils() {

diff --git a/package/plato/package b/package/plato/package
@@ -5,7 +5,7 @@
 pkgnames=(plato)
 pkgdesc="Document reader"
 url=https://github.com/LinusCDE/plato
-pkgver=0.9.34-1
+pkgver=0.9.34-2
 timestamp=2023-03-08T17:58Z
 section="readers"
 maintainer="Linus K. <[email protected]>"

diff --git a/package/puzzles/package b/package/puzzles/package
@@ -5,7 +5,7 @@
 pkgnames=(puzzles)
 timestamp=2021-03-04T14:03-08:00
 maintainer="Mattéo Delabre <[email protected]>"
-pkgver=0.2.2-3
+pkgver=0.2.2-4
 license=MIT
 pkgdesc="Simon Tatham's Puzzle Package"
 url="https://github.com/mrichards42/remarkable_puzzles"

diff --git a/package/recrossable/package b/package/recrossable/package
@@ -5,7 +5,7 @@
 pkgnames=(recrossable)
 pkgdesc="Solve crossword puzzles"
 url=https://github.com/sandsmark/recrossable
-pkgver=0.0.0-7
+pkgver=0.0.0-8
 timestamp=2021-01-15T12:58:22Z
 section="games"
 maintainer="Mattéo Delabre <[email protected]>"

diff --git a/package/regenda/package b/package/regenda/package
@@ -5,7 +5,7 @@
 pkgnames=(regenda)
 pkgdesc="Caldav agenda app"
 url=https://github.com/tenJirka/reGenda
-pkgver=0.0.2-1
+pkgver=0.0.2-2
 timestamp=2023-09-06T06:45Z
 section="utils"
 maintainer="tenJirka <[email protected]>"

diff --git a/package/reterm/package b/package/reterm/package
@@ -4,7 +4,7 @@
 pkgnames=(reterm)
 pkgdesc="Landscape terminal support for the Remarkable 2 + type cover"
 section="admin"
-pkgver="20230628.1927-1"
+pkgver="20230628.1927-2"
 timestamp="2023-06-28T19:28:06Z"
 maintainer="Eeems <[email protected]>"
 url="https://github.com/i-am-shodan/ReTerm"
@@ -49,9 +49,3 @@ package() {
     install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/draft/reterm.png
     install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/oxide/reterm.oxide
 }
-
-configure() {
-    if is-active "tarnish.service"; then
-        type update-desktop-database &> /dev/null && update-desktop-database
-    fi
-}
diff --git a/package/retris/package b/package/retris/package
@@ -5,7 +5,7 @@
 pkgnames=(retris)
 pkgdesc="Tetris game"
 url=https://github.com/LinusCDE/retris
-pkgver=0.6.3-3
+pkgver=0.6.3-4
 timestamp=2021-01-30T02:41Z
 section="games"
 maintainer="Linus K. <[email protected]>"

diff --git a/package/rmfm/package b/package/rmfm/package
@@ -5,7 +5,7 @@
 pkgnames=(rmfm)
 pkgdesc="Bare-bones file manager using Node.js and sas"
 url="https://forgejo.sny.sh/sun/rmFM"
-pkgver=1.5.0-1
+pkgver=1.5.0-2
 timestamp=2023-08-08T22:19:23+02:00
 section=utils
 maintainer="Sunny <[email protected]>"

diff --git a/package/rmkit/package b/package/rmkit/package
@@ -40,14 +40,13 @@ bufshot() {
 dumbskull() {
     pkgdesc="Dungeon Crawl themed Solitaire"
     url="https://rmkit.dev/apps/dumbskull"
-    pkgver=0.0.1-2
+    pkgver=0.0.1-3
     section="games"
 
     package() {
         install -D -m 755 "$srcdir"/src/build/dumbskull "$pkgdir"/opt/bin/dumbskull
         install -D -m 644 "$srcdir"/src/dumbskull/dumbskull.draft "$pkgdir"/opt/etc/draft/dumbskull.draft
     }
-
 }
 
 genie() {
@@ -80,7 +79,7 @@ genie() {
 harmony() {
     pkgdesc="Procedural sketching app"
     url="https://rmkit.dev/apps/harmony"
-    pkgver=0.2.2-1
+    pkgver=0.2.2-2
     section="drawing"
 
     package() {
@@ -120,7 +119,7 @@ lamp() {
 mines() {
     pkgdesc="Mine detection game"
     url="https://rmkit.dev/apps/minesweeper"
-    pkgver=0.1.4-2
+    pkgver=0.1.4-3
     section="games"
 
     package() {
@@ -133,7 +132,7 @@ mines() {
 nao() {
     pkgdesc="Nao Package Manager: opkg UI built with SAS"
     url="https://rmkit.dev/apps/nao"
-    pkgver=0.1.2-3
+    pkgver=0.1.2-4
     section="admin"
     installdepends+=(simple)
 
@@ -179,15 +178,14 @@ remux() {
 rpncalc() {
     pkgdesc="RPN Calculator"
     url="https://rmkit.dev/apps/rpncalc"
-    pkgver=0.0.3-2
+    pkgver=0.0.3-3
     section="math"
 
     package() {
         install -D -m 755 "$srcdir"/src/build/rpncalc "$pkgdir"/opt/bin/rpncalc
         install -D -m 644 "$srcdir"/src/rpncalc/rpncalc.draft "$pkgdir"/opt/etc/draft/rpncalc.draft
         install -D -m 644 "$srcdir"/src/rpncalc/rpncalc.png "$pkgdir"/opt/etc/draft/icons/rpncalc.png
     }
-
 }
 
 simple() {
@@ -204,12 +202,11 @@ simple() {
 wordlet() {
     pkgdesc="Wordle clone"
     url="https://rmkit.dev/apps/wordlet"
-    pkgver=0.0.2-2
+    pkgver=0.0.2-3
     section="games"
 
     package() {
         install -D -m 755 "$srcdir"/src/build/wordlet "$pkgdir"/opt/bin/wordlet
         install -D -m 644 "$srcdir"/src/wordlet/wordlet.draft "$pkgdir"/opt/etc/draft/wordlet.draft
     }
-
 }
diff --git a/package/sill/package b/package/sill/package
@@ -5,7 +5,7 @@
 pkgnames=(sill)
 pkgdesc="Gesture-based text editor (and shell) for the reMarkable tablet"
 url=https://github.com/bkirwi/sill
-pkgver=0.1.1-alpha
+pkgver=0.1.1-1
 section="writing"
 timestamp=2023-08-12T00:00Z
 maintainer="Kai <[email protected]>"

diff --git a/package/tilem/package b/package/tilem/package
@@ -5,7 +5,7 @@
 pkgnames=(tilem)
 pkgdesc="TI-84+ calculator emulator"
 url=https://github.com/timower/rM2-stuff/tree/master/apps/tilem
-pkgver=0.0.7-2
+pkgver=0.0.7-3
 timestamp=2021-04-30T10:42Z
 maintainer="Mattéo Delabre <[email protected]>"
 license=GPL-3.0

diff --git a/package/vnsee/package b/package/vnsee/package
@@ -5,7 +5,7 @@
 pkgnames=(vnsee)
 pkgdesc="VNC client allowing you to use the device as a second screen"
 url=https://github.com/matteodelabre/vnsee
-pkgver=0.4.1-1
+pkgver=0.4.1-2
 timestamp=2021-08-29T13:45:26Z
 section="screensharing"
 maintainer="Mattéo Delabre <[email protected]>"

diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package
@@ -5,7 +5,7 @@
 pkgnames=(whiteboard-hypercard)
 pkgdesc="Real-time collaboration, drawing or whiteboarding"
 url=https://github.com/fenollp/reMarkable-tools
-pkgver=0.3.7-1
+pkgver=0.3.7-2
 timestamp=2023-10-11T12:57Z
 section="drawing"
 maintainer="Pierre Fenoll <[email protected]>"

diff --git a/package/wikipedia/package b/package/wikipedia/package
@@ -5,7 +5,7 @@
 pkgnames=(wikipedia)
 pkgdesc="The free encyclopedia"
 url=https://github.com/dps/remarkable-wikipedia
-pkgver=0.1.0-3
+pkgver=0.1.0-4
 timestamp=2021-03-11T04:50Z
 section="readers"
 maintainer="David Singleton <[email protected]>"

diff --git a/package/xochitl/package b/package/xochitl/package
@@ -5,7 +5,7 @@
 pkgnames=(xochitl)
 pkgdesc="Read documents and take notes"
 url=https://remarkable.com
-pkgver=0.0.0-15
+pkgver=0.0.0-16
 timestamp=2022-11-07T20:19:57Z
 section="readers"
 maintainer="Mattéo Delabre <[email protected]>"

diff --git a/package/yaft/package b/package/yaft/package
@@ -6,7 +6,7 @@ pkgnames=(yaft)
 pkgdesc="Yet another framebuffer terminal"
 url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft
 _tag=0.0.10
-pkgver=${_tag}-1
+pkgver=${_tag}-2
 timestamp=2023-08-12T14:31Z
 maintainer="Mattéo Delabre <[email protected]>"
 license=GPL-3.0

diff --git a/package/zshelf/package b/package/zshelf/package
@@ -5,7 +5,7 @@
 pkgnames=(zshelf)
 pkgdesc="Z-Library browser and downloader"
 url=https://github.com/khanhas/zshelf
-pkgver=0.3.1-3
+pkgver=0.3.1-4
 section=utils
 timestamp=2021-02-20T01:45Z
 maintainer="khanhas <[email protected]>"

diff --git a/scripts/install-lib b/scripts/install-lib
@@ -105,10 +105,18 @@ reload-oxide-apps() {
         return
     fi
     echo -n "Reloading Oxide applications: "
-    if ! /opt/bin/rot apps call reload 2> /dev/null; then
-        echo "Failed!"
+    local ret
+    if type update-desktop-database &> /dev/null; then
+        update-desktop-database --quiet
+        ret=$?
     else
+        /opt/bin/rot apps call reload 2> /dev/null
+        ret=$?
+    fi
+    if [ $ret -eq 0 ]; then
         echo "Done!"
+    else
+        echo "Failed!"
     fi
 }
 

diff --git a/scripts/toltec/builder.py b/scripts/toltec/builder.py
@@ -548,7 +548,9 @@ def _archive(self, package: Package, pkg_dir: str) -> None:
         os.makedirs(ar_dir, exist_ok=True)
 
         # Inject Oxide-specific hook for reloading apps
-        if os.path.exists(os.path.join(pkg_dir, "opt/usr/share/applications")):
+        if os.path.exists(
+            os.path.join(pkg_dir, "opt/usr/share/applications")
+        ) or os.path.exists(os.path.join(pkg_dir, "opt/etc/draft")):
             oxide_hook = "\nreload-oxide-apps\n"
             package.functions["configure"] += oxide_hook
             package.functions["postupgrade"] += oxide_hook