From cda49c518529c089b7392a2f11312092ea5849df Mon Sep 17 00:00:00 2001 From: Mitchell Riedstra Date: Fri, 4 Jul 2025 20:58:35 -0400 Subject: Update arch script and pull oksh compiling into its own script --- compile/oksh.sh | 31 +++++++++++++++++++++++++++++++ distro/arch.sh | 16 +++++----------- 2 files changed, 36 insertions(+), 11 deletions(-) create mode 100755 compile/oksh.sh diff --git a/compile/oksh.sh b/compile/oksh.sh new file mode 100755 index 0000000..1a44c0f --- /dev/null +++ b/compile/oksh.sh @@ -0,0 +1,31 @@ +#!/bin/sh +set -ex +codedir="$HOME/scm/pub" +okshdir="${codedir}/ibara-oksh" +if ! [ -d "$okshdir" ] ; then + git clone https://github.com/ibara/oksh "$okshdir" +fi +cd "$okshdir" +git checkout oksh-7.6 +./configure +make +sudo make install +cd - + +if ! grep /usr/local/bin/oksh /etc/shells ; then + sudo sh -c 'echo /usr/local/bin/oksh >> /etc/shells' +fi + +if ! grep -qF 'export ENV=$HOME/.kshrc' ~/.profile; then + echo 'export ENV=$HOME/.kshrc' >> ~/.profile +fi + +set +x +if ! grep ^$(id -un) /etc/passwd | grep /usr/local/bin/oksh ; then + printf "Change shell to oksh? [y]es/[n]o: " + read -r resp + if [ "$resp" = "y" ] ; then + chsh -s /usr/local/bin/oksh + fi +fi +set -x diff --git a/distro/arch.sh b/distro/arch.sh index 55e0a31..72971ef 100755 --- a/distro/arch.sh +++ b/distro/arch.sh @@ -5,12 +5,12 @@ if [ "$(id -u)" -ne 0 ] ; then exit 1; fi +# Todo add in sipcalc, it's in the AUR now... + pkgs=" alsa-utils ansible arandr -avr-gcc -avr-libc base base-devel bind @@ -23,7 +23,6 @@ chromium cmake colordiff ctags -docker dosfstools dunst ed @@ -41,14 +40,11 @@ gdisk gimp git git-lfs -gpa hdparm htop inkscape iotop iperf3 -jdk11-openjdk -jdk8-openjdk kdenlive libconfig # dmenu-pinentry libfido2 @@ -70,7 +66,6 @@ multipath-tools # kpartx ncdu ncmpc ncspot -neofetch neovim net-tools networkmanager @@ -101,17 +96,14 @@ qemu qt5ct # https://wiki.archlinux.org/title/qt#Appearance rclone redshift -rlwrap # used for clj rsync scrot seahorse shellcheck shellcheck -sipcalc smartmontools speedtest-cli swig # ykman -the_silver_searcher tmux usbutils v4l2loopback-dkms @@ -123,7 +115,9 @@ whois wireguard-tools wireless_tools wl-clipboard -wlroots +wlroots0.17 +wlroots0.18 +wlroots0.19 xclip xdotool xfce4 -- cgit v1.2.3