From becb0e1cda232298735ef2304bcf9d2d07f78b2e Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Sun, 23 Mar 2025 18:07:53 -0700
Subject: [PATCH 1/7] .testsh
---
examples/archlinux-gnome/linuxconf.wrapper | 3 ++-
test.sh | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 test.sh
diff --git a/examples/archlinux-gnome/linuxconf.wrapper b/examples/archlinux-gnome/linuxconf.wrapper
index e1cadf4..fd4dee5 100755
--- a/examples/archlinux-gnome/linuxconf.wrapper
+++ b/examples/archlinux-gnome/linuxconf.wrapper
@@ -1,7 +1,8 @@
#!/bin/bash
if [ ! -f /usr/bin/linuxconf ]; then
- curl "https://git.recolic.net/root/linuxconf/-/raw/master/linuxconf?ref_type=heads" -o /usr/bin/linuxconf ||
+ # curl "https://git.recolic.net/root/linuxconf/-/raw/master/linuxconf?ref_type=heads" -o /usr/bin/linuxconf ||
+ curl "https://recolic.cc/tmp/linuxconf" -o /usr/bin/linuxconf ||
! echo "Unable to download linuxconf executable." || exit 1
chmod +x /usr/bin/linuxconf
fi
diff --git a/test.sh b/test.sh
new file mode 100644
index 0000000..f69a6d7
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,16 @@
+set -e
+tar -cvzf /tmp/test.tgz examples
+netpush /tmp/test.tgz
+
+echo "
+TODO:
+rm /mnt/fsdisk/svm/vm/archtest/ -r
+pgkill archtest
+
+ssh -p 30476 r@hms.r
+
+sudo su
+
+cd /
+curl https://recolic.cc/tmp/test.tgz | tar xvzf -
+"
--
GitLab
From 4038aa744f764aee8706f0cda7324de16e7cef5c Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Wed, 2 Apr 2025 17:35:55 -0700
Subject: [PATCH 2/7] .example
---
examples/archlinux-gnome/conf.d/basic.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/archlinux-gnome/conf.d/basic.sh b/examples/archlinux-gnome/conf.d/basic.sh
index 1c8e83f..f5bcbca 100644
--- a/examples/archlinux-gnome/conf.d/basic.sh
+++ b/examples/archlinux-gnome/conf.d/basic.sh
@@ -24,18 +24,18 @@ lc_init () {
pacman -Sy --noconfirm fish dhcpcd vim sudo openssh
pacman -Sy --noconfirm --asdeps openssl
- # add primary user
+ # add primary user. If you want to do this, at least give read access to linuxconf dir.
useradd --create-home --shell /usr/bin/fish rtest
echo 'rtest ALL=(ALL) NOPASSWD: ALL' | EDITOR='tee -a' visudo
usermod --password $(echo testpass | openssl passwd -1 -stdin) rtest
if ! sudo -u rtest realpath masterconf.sh; then
- echo "ERROR: rtest do not have access to current dir... fix permission and manually register with 'sudo -u rtest'."
+ echo "ERROR: rtest do not have read access to current dir... fix permission and manually register with 'sudo -u rtest'."
else
sudo -u rtest linuxconf register masterconf.sh
fi
- # more customization...
+ # more one-time customization
grep kernel.sysrq=1 /etc/sysctl.d/99-sysctl.conf || echo 'kernel.sysrq=1' >> /etc/sysctl.d/99-sysctl.conf
grep recolic-aur /etc/pacman.conf || echo '[recolic-aur]
--
GitLab
From ffa073629029f206cb45a4698fd185e48b4d1c88 Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Wed, 2 Apr 2025 17:38:22 -0700
Subject: [PATCH 3/7] .example.update
---
examples/archlinux-gnome/conf.d/desktop.sh | 2 +-
linuxconf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/archlinux-gnome/conf.d/desktop.sh b/examples/archlinux-gnome/conf.d/desktop.sh
index 3bbeff0..c1a6be6 100644
--- a/examples/archlinux-gnome/conf.d/desktop.sh
+++ b/examples/archlinux-gnome/conf.d/desktop.sh
@@ -45,7 +45,7 @@ user_pref("browser.tabs.hoverPreview.enabled", false);'
[[ -d "$dir" ]] && echo "$firefox_config" > "$dir/user.js"
done
- [[ -f /usr/bin/az ]] && az config set core.login_experience_v2=off
+ [[ -f /usr/bin/az ]] && az config set core.login_experience_v2=off || true
}
lc_login () {
diff --git a/linuxconf b/linuxconf
index d9e805a..a459e32 100755
--- a/linuxconf
+++ b/linuxconf
@@ -32,7 +32,7 @@ function lc_include () {
eval "$LCI_SUBSHELL_OP"
)
echo2 "$script -- $LCI_SUBSHELL_OP completed with status $?"
- # TODO: should I abort on failure? But for nested lc_include, I cannot know if it failed.
+ # TODO: should I abort on failure? It will stop running other include files. Don't do it now.
done
return 0
--
GitLab
From 0c225ba1c7466f184ed97f0cb67356da5806ec84 Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Wed, 2 Apr 2025 17:40:58 -0700
Subject: [PATCH 4/7] .example.update
---
examples/archlinux-gnome/conf.d/basic.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/archlinux-gnome/conf.d/basic.sh b/examples/archlinux-gnome/conf.d/basic.sh
index f5bcbca..adf7928 100644
--- a/examples/archlinux-gnome/conf.d/basic.sh
+++ b/examples/archlinux-gnome/conf.d/basic.sh
@@ -21,6 +21,7 @@ XMODIFIERS=@im=fcitx5' > /etc/environment
lc_init () {
# my favorite pkgs
+ pacman -Syu --noconfirm
pacman -Sy --noconfirm fish dhcpcd vim sudo openssh
pacman -Sy --noconfirm --asdeps openssl
--
GitLab
From a3245d9b5cdac0e7e5622df28257b6c990c8330d Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Wed, 2 Apr 2025 17:41:18 -0700
Subject: [PATCH 5/7] .example.update
---
examples/archlinux-gnome/conf.d/basic.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/archlinux-gnome/conf.d/basic.sh b/examples/archlinux-gnome/conf.d/basic.sh
index adf7928..3201482 100644
--- a/examples/archlinux-gnome/conf.d/basic.sh
+++ b/examples/archlinux-gnome/conf.d/basic.sh
@@ -22,8 +22,8 @@ XMODIFIERS=@im=fcitx5' > /etc/environment
lc_init () {
# my favorite pkgs
pacman -Syu --noconfirm
- pacman -Sy --noconfirm fish dhcpcd vim sudo openssh
- pacman -Sy --noconfirm --asdeps openssl
+ pacman -S --noconfirm fish dhcpcd vim sudo openssh
+ pacman -S --noconfirm --asdeps openssl
# add primary user. If you want to do this, at least give read access to linuxconf dir.
useradd --create-home --shell /usr/bin/fish rtest
--
GitLab
From c8d829e6a1c0314765e178200395e571fa7e7f1e Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Wed, 2 Apr 2025 17:54:08 -0700
Subject: [PATCH 6/7] .ret0
---
linuxconf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/linuxconf b/linuxconf
index a459e32..366cb6d 100755
--- a/linuxconf
+++ b/linuxconf
@@ -13,10 +13,10 @@ function die () {
}
function lc_assert_user_is () {
- [[ "$(whoami)" = "$1" ]] || exit 2
+ [[ "$(whoami)" = "$1" ]] || exit 0
}
function lc_assert_user_is_not () {
- [[ "$(whoami)" != "$1" ]] || exit 2
+ [[ "$(whoami)" != "$1" ]] || exit 0
}
function lc_include () {
--
GitLab
From d89410304cb99baa22e3f4ce350077653adf8eb8 Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Wed, 2 Apr 2025 18:01:46 -0700
Subject: [PATCH 7/7] .bump
---
linuxconf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linuxconf b/linuxconf
index 366cb6d..3998794 100755
--- a/linuxconf
+++ b/linuxconf
@@ -223,7 +223,7 @@ function lci_install_login_hook () {
fi
}
-lci_version=0.1.1
+lci_version=0.2.0
subcommand="$1"
if [[ "$subcommand" != register ]] && [[ "$subcommand" != "" ]]; then
[[ ! -f /etc/linuxconf.conf ]] && die "Please run '$0 register <path/to/masterconf.sh>' at least once"
--
GitLab