From 1acf0d3a2a4e92af9634ad6e255b22c8e48b5f95 Mon Sep 17 00:00:00 2001
From: navewindre <boneyaard@gmail.com>
Date: Thu, 3 Jul 2025 22:59:19 +0200
Subject: a

---
 slackware-bootstrap/cleanup        |  3 ++-
 slackware-bootstrap/package-purge  |  0
 slackware-bootstrap/step1          |  0
 slackware-bootstrap/step2          | 25 ++++++++-----------------
 slackware-bootstrap/step2-finish   | 21 +++++++++++++++++++++
 slackware-bootstrap/update-current |  0
 6 files changed, 31 insertions(+), 18 deletions(-)
 mode change 100644 => 100755 slackware-bootstrap/cleanup
 mode change 100644 => 100755 slackware-bootstrap/package-purge
 mode change 100644 => 100755 slackware-bootstrap/step1
 mode change 100644 => 100755 slackware-bootstrap/step2
 create mode 100755 slackware-bootstrap/step2-finish
 mode change 100644 => 100755 slackware-bootstrap/update-current

(limited to 'slackware-bootstrap')

diff --git a/slackware-bootstrap/cleanup b/slackware-bootstrap/cleanup
old mode 100644
new mode 100755
index 7747c9d..f410dbf
--- a/slackware-bootstrap/cleanup
+++ b/slackware-bootstrap/cleanup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 rm ~/.step1-done
 rm ~/.stable-done
@@ -9,3 +9,4 @@ rm ~/.multilib-done
 rm ~/.kernel-done
 rm ~/.nvidia-done
 rm ~/.step2-done
+rm ~/.nreboot
diff --git a/slackware-bootstrap/package-purge b/slackware-bootstrap/package-purge
old mode 100644
new mode 100755
diff --git a/slackware-bootstrap/step1 b/slackware-bootstrap/step1
old mode 100644
new mode 100755
diff --git a/slackware-bootstrap/step2 b/slackware-bootstrap/step2
old mode 100644
new mode 100755
index 2598cf7..4fc73b7
--- a/slackware-bootstrap/step2
+++ b/slackware-bootstrap/step2
@@ -3,6 +3,11 @@ basedir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 kernelver="6.15.2"
 
+if [[ -f "~/.step2-done" ]]; then
+  sh $basedir/step2-done
+  exit
+fi
+
 rm /root/.bash_profile
 
 if [[ ! -f "~/.slpkg-done" ]]; then
@@ -46,21 +51,7 @@ fi
 
 touch ~/.step2-done
 if [[ $nreboot == 1 ]]; then
-  echo "sh $basedir/finish" >> /root/.bash_profile
-  echo "rm -f /root/.bash_profile" >> /root/.bash_profile
-  echo "============================ [ reboot ] ==========================="
-  printf "\x1b[1;31mupon reboot, make sure to log in as ROOT first !!!\x1b[0;0m\n"
-  echo "==================================================================="
-  read -p "press enter to reboot your system"
-  echo "rebooting..."
-  reboot
-else
-  sh $basedir/runlevel
-  sh $basedir/cleanup
-
-  echo "============== [ setup done ] ==============="
-  echo "username: $username"
-  echo "you may now log into your user account."
-  echo "it is recommended to reboot your system now."
-  echo "=============================================="
+  touch ~/.nreboot
 fi
+
+sh $basedir/step2-done
diff --git a/slackware-bootstrap/step2-finish b/slackware-bootstrap/step2-finish
new file mode 100755
index 0000000..595f5a3
--- /dev/null
+++ b/slackware-bootstrap/step2-finish
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [[ -f "~/.nreboot" ]]; then
+  echo "sh $basedir/finish" >> /root/.bash_profile
+  echo "rm -f /root/.bash_profile" >> /root/.bash_profile
+  echo "============================ [ reboot ] ==========================="
+  printf "\x1b[1;31mupon reboot, make sure to log in as ROOT first !!!\x1b[0;0m\n"
+  echo "==================================================================="
+  read -p "press enter to reboot your system"
+  echo "rebooting..."
+  reboot
+else
+  sh $basedir/runlevel
+  sh $basedir/cleanup
+
+  echo "============== [ setup done ] ==============="
+  echo "username: $username"
+  echo "you may now log into your user account."
+  echo "it is recommended to reboot your system now."
+  echo "=============================================="
+fi
diff --git a/slackware-bootstrap/update-current b/slackware-bootstrap/update-current
old mode 100644
new mode 100755
-- 
cgit v1.2.3