Skip to content

Commit

Permalink
Add terminfo dependency to yaft and add /opt/etc/profile to /etc/prof… (
Browse files Browse the repository at this point in the history
#715)

* Add terminfo dependency to yaft and add /opt/etc/profile to /etc/profile.d

* Don't override TERM if it's already set, and run bash with profile includes from yaft
  • Loading branch information
Eeems authored Aug 15, 2023
1 parent 39ee03e commit e714122
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
7 changes: 6 additions & 1 deletion package/toltec-base/package
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ archs=(rm1 rm2)
pkgnames=(toltec-base)
pkgdesc="Metapackage defining the base set of packages in a Toltec install"
url=https://toltec-dev.org/
pkgver=1.2-1
pkgver=1.2-2
timestamp=2023-05-08T19:31Z
section="utils"
maintainer="Eeems <[email protected]>"
Expand All @@ -24,6 +24,11 @@ package() {
}

configure() {
ln -sf /opt/etc/profile /etc/profile.d/toltec.sh
# shellcheck disable=SC2016
sed -i \
-e 's|^export TERM=xterm|if \[ -z "$TERM" \];then export TERM=xterm;fi|' \
/opt/etc/profile
if is-enabled "update-engine.service"; then
echo "Disabling automatic update"
systemctl disable --now update-engine
Expand Down
13 changes: 13 additions & 0 deletions package/yaft/bash-l.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/apps/yaft/main.cpp b/apps/yaft/main.cpp
index baa1f56..1d4ee6a 100755
--- a/apps/yaft/main.cpp
+++ b/apps/yaft/main.cpp
@@ -200,7 +200,7 @@ main(int argc, const char* argv[]) {
extern volatile sig_atomic_t need_redraw;
extern volatile sig_atomic_t child_alive;
extern struct termios termios_orig;
- static const char* shell_args[2] = { shell_cmd, NULL };
+ static const char* shell_args[3] = { shell_cmd, "-l", NULL };

Keyboard keyboard;

7 changes: 5 additions & 2 deletions package/yaft/package
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,29 @@ pkgnames=(yaft)
pkgdesc="Yet another framebuffer terminal"
url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft
_tag=0.0.8
pkgver=${_tag}-1
pkgver=${_tag}-2
timestamp=2021-05-02T09:23Z
maintainer="Mattéo Delabre <[email protected]>"
license=GPL-3.0
section="admin"
image=base:v2.3
installdepends=(display)
installdepends=(display terminfo)

source=(
"https://github.com/timower/rM2-stuff/archive/refs/tags/v${_tag}.zip"
input.patch
bash-l.patch
)

sha256sums=(
718a9fc7a8e26d587bac790fd83ad8242978b59745269b2ff213e04820bf45b8
SKIP
SKIP
)

build() {
patch -u libs/rMlib/Device.cpp -i input.patch
patch -u apps/yaft/main.cpp -i bash-l.patch
mkdir build
mkdir install
cd build
Expand Down

0 comments on commit e714122

Please sign in to comment.