diff --git a/package/bottom/package b/package/bottom/package deleted file mode 100644 index 9637894de..000000000 --- a/package/bottom/package +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# Copyright (c) 2023 The Toltec Contributors -# SPDX-License-Identifier: MIT - -pkgnames=(bottom) -pkgdesc="Cross-platform graphical process/system monitor" -url=https://github.com/ClementTsang/bottom -pkgver=0.9.6-1 -timestamp=2023-08-26T14:43Z -section="utils" -maintainer="gbyl " -license=MIT - -image=rust:v3.1 -source=("https://github.com/ClementTsang/bottom/archive/refs/tags/${pkgver%-*}.zip") -sha256sums=(38c1a544ceeac4792f8e4acbf3adbf0a6d7a935afb7ef9121aaba1e7ed25cea3) - -build() { - cargo build --release -} - -package() { - install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/btm "$pkgdir"/opt/bin/btm -} diff --git a/package/toltec-base/opt-usr-bin.sh b/package/toltec-base/opt-usr-bin.sh new file mode 100644 index 000000000..9ff6643dc --- /dev/null +++ b/package/toltec-base/opt-usr-bin.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +export PATH=/opt/usr/bin:$PATH diff --git a/package/toltec-base/package b/package/toltec-base/package index 183cb2995..e4b0a4539 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -6,7 +6,7 @@ archs=(rmall rmallos2 rmallos3 rm1 rm1os2 rm1os3 rm2 rm2os2 rm2os3) pkgnames=(toltec-base) pkgdesc="Metapackage defining the base set of packages in a Toltec install" url=https://toltec-dev.org/ -pkgver=1.3-4 +pkgver=1.4-1 timestamp=2023-12-27T08:30Z section="utils" maintainer="Eeems " @@ -17,11 +17,11 @@ installdepends_rm1os3=(open-remarkable-shutdown) installdepends_rm2os2=(rm2-suspend-fix) installdepends_rm2os3=(rm2-suspend-fix) -source=() -sha256sums=() +source=(opt-usr-bin.sh) +sha256sums=(SKIP) package() { - true + install -D -m 755 -t "$pkgdir"/etc/profile.d/ "$srcdir"/opt-usr-bin.sh } configure() { diff --git a/package/toltec-bootstrap/package b/package/toltec-bootstrap/package index cc1d68274..90d201f50 100644 --- a/package/toltec-bootstrap/package +++ b/package/toltec-bootstrap/package @@ -5,7 +5,7 @@ pkgnames=(toltec-bootstrap) pkgdesc="Manage your Toltec install" url=https://toltec-dev.org/ -pkgver=0.4.4-1 +pkgver=0.4.5-1 timestamp=2024-05-31T19:13Z section="utils" maintainer="Eeems " diff --git a/package/toltec-bootstrap/toltecctl b/package/toltec-bootstrap/toltecctl index 261e98392..5a26d3790 100644 --- a/package/toltec-bootstrap/toltecctl +++ b/package/toltec-bootstrap/toltecctl @@ -679,7 +679,7 @@ reenable() { generate-opkg-conf || true log INFO "Opkg update" opkg update - log INFO "Reinsalling base packages" + log INFO "Reinstalling base packages" reinstall-base log INFO "Reinstalling packages with files on the root partition" reinstall-root