a

6 files changed, 31 insertions, 18 deletions

diff --git a/slackware-bootstrap/cleanup b/slackware-bootstrap/cleanup
index 7747c9d..f410dbf 100644..100755
--- 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
index 5f681b8..5f681b8 100644..100755
--- a/slackware-bootstrap/package-purge
+++ b/slackware-bootstrap/package-purge
diff --git a/slackware-bootstrap/step1 b/slackware-bootstrap/step1
index d48abac..d48abac 100644..100755
--- a/slackware-bootstrap/step1
+++ b/slackware-bootstrap/step1
diff --git a/slackware-bootstrap/step2 b/slackware-bootstrap/step2
index 2598cf7..4fc73b7 100644..100755
--- 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
index a0e07fa..a0e07fa 100644..100755
--- a/slackware-bootstrap/update-current
+++ b/slackware-bootstrap/update-current