updat

5 files changed, 110 insertions, 15 deletions

diff --git a/slackware-bootstrap/bootstrap b/slackware-bootstrap/bootstrap
index 9960bc0..1fcbc5c 100644
--- a/slackware-bootstrap/bootstrap
+++ b/slackware-bootstrap/bootstrap
@@ -15,3 +15,12 @@ sh $basedir/user
 sh $basedir/sudo
 sh $basedir/slackpkg
 sh $basedir/slpkg
+sh $basedir/multilib
+
+echo "============== [ setup done ] ==============="
+echo "username: $username"
+echo "it's recommended to reboot your system."
+echo "upon reboot you can sign in with your new user"
+echo "=============================================="
+
+read -p "press enter to return to shell"
diff --git a/slackware-bootstrap/multilib b/slackware-bootstrap/multilib
new file mode 100755
index 0000000..ffb7545
--- /dev/null
+++ b/slackware-bootstrap/multilib
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+oldpwd=$(pwd)
+
+mkdir /tmp/multilib
+cd /tmp/multilib
+
+iscurrent=0
+currentstr=$(cat /etc/*-release | grep "VERSION_CODENAME=current")
+if [[ $currentstr != "" ]]; then
+  iscurrent=1
+fi
+
+if [[ $iscurrent == 1 ]]; then
+  slpkg --repository="multilib" -i compat32-tools
+fi
+
+if [[ $iscurrent == 0 ]]; then
+  lftp -c "open http://www.slackware.com/~alien/multilib/ ; mirror -c -e 15.0"
+  cd 15.0
+  upgradepkg --reinstall --install-new *.t?z
+  upgradepkg --install-new slackware64-compat32/*-compat32/*.t?z
+fi
+
+cd $oldpwd
diff --git a/slackware-bootstrap/slackpkg b/slackware-bootstrap/slackpkg
index 8777d1c..7a5942f 100755
--- a/slackware-bootstrap/slackpkg
+++ b/slackware-bootstrap/slackpkg
@@ -1,6 +1,8 @@
 #!/bin/sh
 basedir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
+cp /etc/slackpkg/mirrors $basedir/.mirrors-old
+
 printf "\x1b[1;31m======================= [ \x1b[7;31m ATTENTION \x1b[0;0m\x1b[1;31m ] ========================\n\x1b[0;0m"
 printf "\x1b[16;32mREAD CAREFULLY:\n\x1b[0;0m"
 echo "this script will open a text editor to edit the mirror list"
@@ -25,24 +27,31 @@ echo "================================================"
 
 read -p "press enter to continue"
 echo "running full system update ..."
+slackpkg upgrade slackpkg
 slackpkg upgrade-all
-cp $basedir/slackpkg-blacklist /etc/slackpkg/blacklist
 slackpkg install-new
 
-echo "================= [ system branch ] ==============="
-echo "if you would like, you can now edit the mirrors"
-echo "and switch to -current."
-echo "==================================================="
+cp $basedir/mirrors /etc/slackpkg/mirrors
 
-echo "would you like to edit mirrors and perform a system update now?"
-read -p "enter your choice [y/n] (n): " choice
-if [[ $choice == 'y' ]]; then
-  nano /etc/slackpkg/mirrors
-  echo "running full system update ..."
-  echo "y" | slackpkg update
-  slackpkg upgrade-all
-  slackpkg install-new
-fi
+printf "\x1b[1;31m======================= [ \x1b[7;31m ATTENTION \x1b[0;0m\x1b[1;31m ] ========================\n\x1b[0;0m"
+printf "\x1b[16;32mREAD CAREFULLY:\n\x1b[0;0m"
+echo "you will now have to switch the branch to -current"
+echo "same as before, you will have to manually"
+echo "edit the mirror list."
+echo "scroll down below the 15.0 section"
+echo "and select a suitable -current mirror"
+printf "\x1b[1;31m================================================================\n\x1b[0;0m"
+
+read -p "press enter to continue"
+nano /etc/slackpkg/mirrors
+
+cp $basedir/slackpkg-blacklist-allowkern /etc/slackpkg/blacklist
+echo "running full system update ..."
+slackpkg update
+slackpkg upgrade slackpkg
+slackpkg upgrade-all
+slackpkg install-new
+cp $basedir/slackpkg-blacklist /etc/slackpkg/blacklist
 
 echo "================= [ kde purge ] =================="
 echo "due to how install-new works, kde is always"
diff --git a/slackware-bootstrap/slackpkg-blacklist-allowkern b/slackware-bootstrap/slackpkg-blacklist-allowkern
new file mode 100644
index 0000000..13b6f60
--- /dev/null
+++ b/slackware-bootstrap/slackpkg-blacklist-allowkern
@@ -0,0 +1,52 @@
+# /etc/slackpkg/blacklist
+#
+# This is a blacklist file. Any packages listed here won't be
+# upgraded, removed, or installed by slackpkg.
+
+# aaa_libraries should NOT be blacklisted!
+#
+# You can blacklist using regular expressions.
+#
+# All of the following will be checked for the regex: 
+# Package series, name, version, arch, build, and fullname
+# When blacklisting packages, you can use extended regex on package names
+# (such as xorg-.* instead of xorg-server, xorg-docs, etc), and a trailing 
+# slash for package series ("n/", "ap/", "xap/", etc).
+#
+# To blacklist *only* the "xorg-server" package, use this:
+# xorg-server
+#
+# To blacklist *all* of the "xorg-server-*" packages, use this:
+# xorg-server.*
+#
+# To blacklist the entire KDE package set, use this:
+# kde/
+#
+# You will need to escape any special characters that are present in the
+# package name. For example, to blacklist the gcc-g++ package, use this:
+# gcc-g\+\+
+#
+# DON'T put any space(s) before or after the package name or regex.
+#
+# Automated upgrade of kernel packages may not be wanted in some situations;
+# uncomment the lines below if that fits your circumstances, but note that
+# kernel-headers should *not* be blacklisted:
+#
+#kernel-generic.*
+#kernel-huge.*
+#kernel-modules.*
+#kernel-source.*
+#
+# This one will blacklist all SBo packages:
+[0-9]+_SBo
+
+[0-9]+alien
+[0-9]+compat32
+[0-9]+_slonly
+
+slpkg
+fcitx5.*
+alligator*
+merkuro*
+fcitx*
+tokodon*
diff --git a/slackware-bootstrap/slpkg b/slackware-bootstrap/slpkg
index c325bee..dbed15e 100755
--- a/slackware-bootstrap/slpkg
+++ b/slackware-bootstrap/slpkg
@@ -27,6 +27,6 @@ cd slpkg-5.2.5
 cp -f $basedir/repositories.toml /etc/slpkg/repositories.toml
 cp -f $basedir/slpkg.toml /etc/slpkg/slpkg.toml
 
-slpkg -U
+slpkg -u
 
 cd $oldpwd