From 869428050d2b548c9c4ca8c0fcae9c5f09dad8b3 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Mon, 8 Feb 2021 23:08:31 +0100 Subject: [PATCH] new iso pure added --- README.md | 2 +- .../usr/local/bin/alci-displaymanager-check | 8 +++--- .../usr/local/bin/alci-make-a-pure-arch | 27 +++++++++++++++++++ archiso/packages.x86_64 | 8 +++--- build.sh | 19 ------------- cleanup-v1.sh | 20 -------------- .../30-build-the-iso-the-first-time.sh | 2 +- .../40-build-the-iso-local-again.sh | 2 +- 8 files changed, 38 insertions(+), 50 deletions(-) create mode 100755 archiso/airootfs/usr/local/bin/alci-make-a-pure-arch delete mode 100755 build.sh delete mode 100755 cleanup-v1.sh diff --git a/README.md b/README.md index 872b3b2..4e6ae63 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# DEVELOPMENT +# ALCI STABLE # Arch Linux Calamares Installer or ALCI diff --git a/archiso/airootfs/usr/local/bin/alci-displaymanager-check b/archiso/airootfs/usr/local/bin/alci-displaymanager-check index 330745a..916547f 100755 --- a/archiso/airootfs/usr/local/bin/alci-displaymanager-check +++ b/archiso/airootfs/usr/local/bin/alci-displaymanager-check @@ -15,6 +15,10 @@ # ############################################################################### +package=sddm +if pacman -Qs $package > /dev/null ; then + ln -sf /usr/lib/systemd/system/sddm.service /etc/systemd/system/display-manager.service +fi package=gdm if pacman -Qs $package > /dev/null ; then ln -sf /usr/lib/systemd/system/gdm.service /etc/systemd/system/display-manager.service @@ -27,7 +31,3 @@ package=lightdm if pacman -Qs $package > /dev/null ; then ln -sf /usr/lib/systemd/system/lightdm.service /etc/systemd/system/display-manager.service fi -package=sddm -if pacman -Qs $package > /dev/null ; then - ln -sf /usr/lib/systemd/system/sddm.service /etc/systemd/system/display-manager.service -fi diff --git a/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch b/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch new file mode 100755 index 0000000..881a23d --- /dev/null +++ b/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch @@ -0,0 +1,27 @@ +#!/bin/bash +#set -e +############################################################################### +# Author : Erik Dubois +# Website : https://www.erikdubois.be +# Website : https://www.arcolinux.info +# Website : https://www.arcolinux.com +# Website : https://www.arcolinuxd.com +# Website : https://www.arcolinuxb.com +# Website : https://www.arcolinuxiso.com +# Website : https://www.arcolinuxforum.com +############################################################################### +# +# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. +# +############################################################################### + +pacman -Rs --noconfirm sddm +pacman -Rs --noconfirm bash-completion +pacman -Rs --noconfirm grub +pacman -Rs --noconfirm os-prober +pacman -Rs --noconfirm dex +pacman -Rs --noconfirm libxinerama +pacman -Rs --noconfirm make +pacman -Rs --noconfirm xorg-xkill +pacman -Rs --noconfirm xterm +pacman -Rs --noconfirm xorg-xrdb diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index e7f132c..821f5fb 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -116,20 +116,20 @@ zsh ### VIA CALAMARES CONFIG ### ####################################################### -sddm - alci-dwm #alci-dwm-nemesis alci-calamares #alci-calamares-dev alci-calamares-config #alci-calamares-config-dev +#alci-calamares-pure xterm ####################################################### ### PACKAGES THAT STAY AFTER INSTALLATION ### ####################################################### +sddm bash-completion grub os-prober @@ -141,8 +141,8 @@ xterm xorg-xrdb ##### you can also use nmtui from the terminal -networkmanager -network-manager-applet +#networkmanager +#network-manager-applet ####################################################### ### EXTRAS ### diff --git a/build.sh b/build.sh deleted file mode 100755 index 9e4ca26..0000000 --- a/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -# -# SPDX-License-Identifier: GPL-3.0-or-later - -echo "################################################################## " -tput setaf 2 -echo "This file is kept here for continuity with the videos" -echo "We actually use the script in the folder installation-scripts" -echo "30 will first clean your cache and then build - downloads all packages" -echo "40 will reuse your cache and build - no download if you have the packages" -echo "Use the scripts in the folder installation-scripts instead" -echo "Do not run the scripts with sudo" -echo "But run it like this :" -echo "./30-build-the-iso-the-first-time.sh" -echo "or" -echo "./40-build-the-iso-local-again.sh" -echo "or else your iso will be in the /root folder" -tput sgr0 -echo "################################################################## " diff --git a/cleanup-v1.sh b/cleanup-v1.sh deleted file mode 100755 index 5dd509c..0000000 --- a/cleanup-v1.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -# -# SPDX-License-Identifier: GPL-3.0-or-later - -echo "################################################################## " -tput setaf 2 -echo "This file is kept here for continuity with the videos" -echo "We actually use the script in the folder installation-scripts" -echo "30 will first clean your cache and then build - downloads all packages" -echo "40 will reuse your cache and build - no download if you have the packages" -echo "Use the scripts in the folder installation-scripts instead" -echo "Do not run the scripts with sudo" -echo "But run it like this :" -echo "./30-build-the-iso-the-first-time.sh" -echo "or" -echo "./40-build-the-iso-local-again.sh" -echo "or else your iso will be in the /root folder" -echo "The clean up is done in the scripts." -tput sgr0 -echo "################################################################## " diff --git a/installation-scripts/30-build-the-iso-the-first-time.sh b/installation-scripts/30-build-the-iso-the-first-time.sh index 0969b01..b1f1dff 100755 --- a/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/installation-scripts/30-build-the-iso-the-first-time.sh @@ -36,7 +36,7 @@ echo # setting of the general parameters archisoRequiredVersion="archiso 51-1" buildFolder=$HOME"/alci-build" - outFolder=$HOME"/Alci-Out" + outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso) echo "################################################################## " diff --git a/installation-scripts/40-build-the-iso-local-again.sh b/installation-scripts/40-build-the-iso-local-again.sh index dc2533e..a33ce5b 100755 --- a/installation-scripts/40-build-the-iso-local-again.sh +++ b/installation-scripts/40-build-the-iso-local-again.sh @@ -36,7 +36,7 @@ echo # setting of the general parameters archisoRequiredVersion="archiso 51-1" buildFolder=$HOME"/alci-build" - outFolder=$HOME"/Alci-Out" + outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso) echo "################################################################## "