From a21fe2c820e4b8bdc3ce4c1be963db1cf8d0d714 Mon Sep 17 00:00:00 2001
From: Erik Dubois <erik.dubois@gmail.com>
Date: Mon, 1 Feb 2021 11:29:53 +0100
Subject: [PATCH] changes for new archios

---
 archiso.md                                           |  2 +-
 .../30-build-the-iso-the-first-time.sh               | 10 ++++++----
 installation-scripts/40-build-the-iso-local-again.sh | 12 +++++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/archiso.md b/archiso.md
index 3a44835..033ecb2 100644
--- a/archiso.md
+++ b/archiso.md
@@ -9,7 +9,7 @@ https://www.archlinux.org/packages/extra/any/archiso/
 We are now using this version
 
 
-archiso-version=archiso 50.1-1
+archiso-version=archiso 51-1
 
 
 sudo pacman -Q archiso and you will know your version
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 6b65331..be3f872 100755
--- a/installation-scripts/30-build-the-iso-the-first-time.sh
+++ b/installation-scripts/30-build-the-iso-the-first-time.sh
@@ -34,7 +34,7 @@ echo
 	#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
 
 	# setting of the general parameters
-	archisoRequiredVersion="archiso 50.1-1"
+	archisoRequiredVersion="archiso 51.1"
 	buildFolder=$HOME"/alci-build"
 	outFolder=$HOME"/Alci-Out"
 	archisoVersion=$(sudo pacman -Q archiso)
@@ -61,6 +61,8 @@ echo
 	echo "You need to install the correct version of Archiso"
 	echo "Use 'sudo downgrade archiso' to do that"
 	echo "or update your system"
+	echo "If a new archiso package comes in and you want to test if you can still build"
+	echo "the iso then change the version in line 37."
 	echo "###################################################################################################"
 	tput sgr0
 	exit 1
@@ -71,7 +73,7 @@ echo "################################################################## "
 tput setaf 2
 echo "Phase 2 :"
 echo "- Checking if archiso is installed"
-echo "- Saving current archiso version to readme"
+echo "- Saving current archiso version to archiso.md"
 echo "- Making mkarchiso verbose"
 tput sgr0
 echo "################################################################## "
@@ -123,8 +125,8 @@ echo
 	fi
 
 	echo
-	echo "Saving current archiso version to readme"
-	sudo sed -i "s/\(^archiso-version=\).*/\1$archisoVersion/" ../archiso.readme
+	echo "Saving current archiso version to archiso.md"
+	sudo sed -i "s/\(^archiso-version=\).*/\1$archisoVersion/" ../archiso.md
 	echo
 	echo "Making mkarchiso verbose"
 	sudo sed -i 's/quiet="y"/quiet="n"/g' /usr/bin/mkarchiso
diff --git a/installation-scripts/40-build-the-iso-local-again.sh b/installation-scripts/40-build-the-iso-local-again.sh
index f39d854..30f480c 100755
--- a/installation-scripts/40-build-the-iso-local-again.sh
+++ b/installation-scripts/40-build-the-iso-local-again.sh
@@ -34,7 +34,7 @@ echo
 	#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
 
 	# setting of the general parameters
-	archisoRequiredVersion="archiso 50.1-1"
+	archisoRequiredVersion="archiso 51.1"
 	buildFolder=$HOME"/alci-build"
 	outFolder=$HOME"/Alci-Out"
 	archisoVersion=$(sudo pacman -Q archiso)
@@ -61,6 +61,8 @@ echo
 	echo "You need to install the correct version of Archiso"
 	echo "Use 'sudo downgrade archiso' to do that"
 	echo "or update your system"
+	echo "If a new archiso package comes in and you want to test if you can still build"
+	echo "the iso then change the version in line 37."
 	echo "###################################################################################################"
 	tput sgr0
 	exit 1
@@ -71,7 +73,7 @@ echo "################################################################## "
 tput setaf 2
 echo "Phase 2 :"
 echo "- Checking if archiso is installed"
-echo "- Saving current archiso version to readme"
+echo "- Saving current archiso version to archiso.md"
 echo "- Making mkarchiso verbose"
 tput sgr0
 echo "################################################################## "
@@ -123,8 +125,8 @@ echo
 	fi
 
 	echo
-	echo "Saving current archiso version to readme"
-	sudo sed -i "s/\(^archiso-version=\).*/\1$archisoVersion/" ../archiso.readme
+	echo "Saving current archiso version to archiso.md"
+	sudo sed -i "s/\(^archiso-version=\).*/\1$archisoVersion/" ../archiso.md
 	echo
 	echo "Making mkarchiso verbose"
 	sudo sed -i 's/quiet="y"/quiet="n"/g' /usr/bin/mkarchiso
@@ -282,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 "##################################################################"