-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add terminfo dependency to yaft and add /opt/etc/profile to /etc/prof… (
#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
Showing
3 changed files
with
24 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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]>" | ||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|