From 6ad722e7c4fb9872ad1161405462245e3b309b31 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 29 Nov 2015 19:41:10 +0000
Subject: streamline the process, i'm lazy to write duplicate code...it's much
 easy to just append the quality to the iso after it's done

---
 iso32 | 60 +++++++-----------------------------------------------------
 iso64 | 60 +++++++-----------------------------------------------------
 2 files changed, 14 insertions(+), 106 deletions(-)

diff --git a/iso32 b/iso32
index 9d7fa9d..77bf086 100755
--- a/iso32
+++ b/iso32
@@ -5,67 +5,21 @@
 kernelconfig
 checkroot
 
-# Check core integrity before doing anything
-chrootchecksumx86
-
 export local isoarch="x86"
 export local isoname=""$releasename"-"$releaseversion"-"$isoarch""
 export local tmpiso="/tmp/"$isoname""
 
-dailyisox86 () {
-	export local isostatus="DAILY"
-	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
-	mount -t squashfs "$chrootx86" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
-	umount "$tmpiso"
-}
-
-alphaisox86 () {
-	export local isostatus="ALPHA"
+makeisox86 () {
 	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
+	mkdir -p ""$isoname"/livecd"
 	mount -t squashfs "$chrootx86" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
+	rsync -aHAXr --progress "$tmpiso/" ""$isoname"/livecd/"
 	umount "$tmpiso"
 }
 
-betaisox86 () {
-	export local isostatus="BETA"
-	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
-	mount -t squashfs "$chrootx86" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
-	umount "$tmpiso"
-}
-
-rcisox86 () {
-	export local isostatus="RC"
-	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
-	mount -t squashfs "$chrootx86" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
-	umount "$tmpiso"
-}
-
-stableisox86 () {
-	export local isostatus="STABLE"
-	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
-	mount -t squashfs "$chrootx86" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
-	umount "$tmpiso"
+main () {
+	chrootchecksumx86
+	makeisox86
 }
 
-case $2 in
-	--daily)			dailyisox86
-						;;
-	--alpha)			alphaisox86
-						;;
-	--beta)				betaisox86
-						;;
-	--rc)				rcisox86
-						;;
-	--stable)			stableisox86
-						;;
-esac
+main
diff --git a/iso64 b/iso64
index fb5297c..9280ecd 100755
--- a/iso64
+++ b/iso64
@@ -5,67 +5,21 @@
 kernelconfig
 checkroot
 
-# Check core integrity before doing anything
-chrootchecksumx64
-
 export local isoarch="amd64"
 export local isoname=""$releasename"-"$releaseversion"-"$isoarch""
 export local tmpiso="/tmp/"$isoname""
 
-dailyisox64 () {
-	export local isostatus="DAILY"
-	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
-	mount -t squashfs "$chrootx64" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
-	umount "$tmpiso"
-}
-
-alphaisox64 () {
-	export local isostatus="ALPHA"
+makeisox64 () {
 	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
+	mkdir -p ""$isoname"/livecd"
 	mount -t squashfs "$chrootx64" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
+	rsync -aHAXr --progress "$tmpiso/" ""$isoname"/livecd/"
 	umount "$tmpiso"
 }
 
-betaisox64 () {
-	export local isostatus="BETA"
-	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
-	mount -t squashfs "$chrootx64" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
-	umount "$tmpiso"
-}
-
-rcisox64 () {
-	export local isostatus="RC"
-	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
-	mount -t squashfs "$chrootx64" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
-	umount "$tmpiso"
-}
-
-stableisox64 () {
-	export local isostatus="STABLE"
-	mkdir -p "$tmpiso"
-	mkdir -p ""$isoname"-"$isostatus"/livecd"
-	mount -t squashfs "$chrootx64" "$tmpiso"
-	rsync -aHAXr --progress "$tmpiso/" ""$isoname"-"$isostatus"/livecd/"
-	umount "$tmpiso"
+main () {
+	chrootchecksumx64
+	makeisox64
 }
 
-case $2 in
-	--daily)			dailyisox64
-						;;
-	--alpha)			alphaisox64
-						;;
-	--beta)				betaisox64
-						;;
-	--rc)				rcisox64
-						;;
-	--stable)			stableisox64
-						;;
-esac
+main
-- 
cgit v1.2.3