From 1041043fb85e3e5cae63c86895f9e8df2095bc55 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Tue, 9 Feb 2021 09:09:49 +0100 Subject: [PATCH] test push --- archiso/airootfs/usr/local/bin/alci-make-a-pure-arch | 11 +---------- archiso/profiledef.sh | 1 + .../30-build-the-iso-the-first-time.sh | 2 +- installation-scripts/40-build-the-iso-local-again.sh | 8 ++++---- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch b/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch index 881a23d..e2bbfa2 100755 --- a/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch +++ b/archiso/airootfs/usr/local/bin/alci-make-a-pure-arch @@ -15,13 +15,4 @@ # ############################################################################### -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 +#if necessary we can use this script too diff --git a/archiso/profiledef.sh b/archiso/profiledef.sh index af1e349..487f3da 100644 --- a/archiso/profiledef.sh +++ b/archiso/profiledef.sh @@ -22,5 +22,6 @@ file_permissions=( ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755" + ["/usr/local/bin/alci-make-a-pure-arch"]="0:0:755" ["/usr/local/bin/alci-displaymanager-check"]="0:0:755" ) 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 b1f1dff..4268221 100755 --- a/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/installation-scripts/30-build-the-iso-the-first-time.sh @@ -284,7 +284,7 @@ echo # echo "Moving pkglist.x86_64.txt" # echo "########################" # cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/$isoLabel".pkglist.txt" -# +# echo echo "##################################################################" diff --git a/installation-scripts/40-build-the-iso-local-again.sh b/installation-scripts/40-build-the-iso-local-again.sh index a33ce5b..ee56349 100755 --- a/installation-scripts/40-build-the-iso-local-again.sh +++ b/installation-scripts/40-build-the-iso-local-again.sh @@ -281,10 +281,10 @@ echo # echo "########################" # md5sum $isoLabel | tee $isoLabel.md5 # echo -# echo "Moving pkglist.x86_64.txt" -# echo "########################" -# cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/$isoLabel".pkglist.txt" -# + echo "Moving pkglist.x86_64.txt" + echo "########################" + cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/pkglist.txt + #echo #echo "##################################################################"