From 4688da364731c3d02ed575b17afc32fe30d84d9f Mon Sep 17 00:00:00 2001
From: Kevin Frantz <mail@kevin-frantz.de>
Date: Mon, 13 Mar 2017 16:26:33 +0100
Subject: [PATCH] Setup Raspi-Arch-Installionscript fertiggestellt

---
 sd_arch_setup.sh | 78 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/sd_arch_setup.sh b/sd_arch_setup.sh
index 9986401..34af207 100644
--- a/sd_arch_setup.sh
+++ b/sd_arch_setup.sh
@@ -5,17 +5,21 @@ echo
 echo "@author KevinFrantz"
 echo "@since 2017-03-12"
 echo 
+if [ `id -u` != 0 ];then
+    echo "Das Script muss als Root aufgerufen werden!"
+    exit 1
+fi
 echo "Liste der aktuell gemounteten Geraete:"
 echo 
 ls -lasi /dev/ | grep "sd"
 echo "(Die Liste zeigt nur Geraete an welche auf den Filter /dev/sd* passen)"
 echo
-while [ \! -b "$ifi" ]
+while [ \! -b "$ofi" ]
 	do
 		echo "Bitte waehlen Sie die korrekte SD-Karte aus:"
 		echo "/dev/:"
 		read device
-		ifi="/dev/$device" 
+		ofi="/dev/$device" 
 done 
 #Pruefen ob der Pfad existiert hinzufuegen
 while [ "$workingpath" == "" ]
@@ -26,10 +30,10 @@ while [ "$workingpath" == "" ]
 			then
 				workingpath=$(pwd)"/"$workingpath
 		fi
-		if [-d "$workingpath" ]
+		if [ -d "$workingpath" ]
 			then
-				i=$((${#workingpath}-1))
-				if [ "${workingpath:$i:1}" != "/"]
+				i=$((${#workingpath}-1)) #Letzte Zeichenstelle ermitteln
+				if [ "${workingpath:$i:1}" != "/" ]
 					then 
 						workingpath=$workingpath"/"				
 				fi 	
@@ -43,39 +47,67 @@ echo "Die Arbeitsvariablen werden gesetzt..."
 imagepath=$workingpath"ArchLinuxARM-rpi-2-latest.tar.gz"
 bootpath=$workingpath"boot" 
 rootpath=$workingpath"root"
+if [ "${ofi:5:1}" != "s" ]
+	then
+		partion="p"
+	else
+		partion=""	
+fi
+ofiboot=$ofi$partion"1"
+ofiroot=$ofi$partion"2"
 echo "Arbeitsverzeichnis: $workingpath"
 echo "Rootpath: $rootpath"
 echo "Bootpath: $bootpath"
 echo "Imagepath: $imagepath"
-echo "SD-Karte: $ifi"
+echo "SD-Karte: $ofi"
+echo "SD-Karte-Partition 1(boot): $ofiboot"
+echo "SD-Karte-Partition 2(root): $ofiroot"
 echo "Bestaetigen Sie mit der Enter-Taste. Zum Abbruch Ctrl + Alt + C druecken"
 read bestaetigung
-echo 
-echo "Follow this steps:"
-echo "Type o. This will clear out any partitions on the drive."
-echo "Type p to list partitions. There should be no partitions left."
-echo "Type n, then p for primary, 1 for the first partition on the drive, press ENTER to accept the default first sector, then type +100M for the last sector."
-echo "Type t, then c to set the first partition to type W95 FAT32 (LBA)."
-echo "Type n, then p for primary, 2 for the second partition on the drive, and then press ENTER twice to accept the default first and last sector."
-echo "Write the partition table and exit by typing w."
-echo "Bestaetigen Sie mit der Enter-Taste. Zum Abbruch Ctrl + Alt + C druecken"
-read bestaetigung
-fdisk $ifi
+echo "fdisk wird ausgefuehrt..."
+(	echo "o"	#Type o. This will clear out any partitions on the drive.
+	echo "p"	#Type p to list partitions. There should be no partitions left
+	echo "n"	#Type n,
+	echo "p"	#then p for primary,
+	echo "1"	#1 for the first partition on the drive,
+	echo ""		#press ENTER to accept the default first sector,
+	echo "+100M"	#then type +100M for the last sector.
+	echo "t"	#Type t,
+	echo "c"	#then c to set the first partition to type W95 FAT32 (LBA).
+	echo "n"	#Type n,
+	echo "p"	#then p for primary,
+	echo "2"	#2 for the second partition on the drive,
+	echo ""		#and then press ENTER twice to accept the default first and last sector.
+	echo ""	
+	echo "w"	#Write the partition table and exit by typing w.
+)| fdisk $ofi
+
+#Bootpartion formatieren und mounten
 echo "Generiere und mounte boot-Partition..."
-mkfs.vfat $ifi"1"
+mkfs.vfat $ofiboot
 mkdir $bootpath
-mount $ifi"1" $bootpath
+mount $ofiboot $bootpath
+
+#Rootpartition formatieren und mounten
 echo "Generiere und mounte root-Partition..."
-mkfs.ext4 $ifi"2"
+mkfs.ext4 $ofiroot
 mkdir $rootpath
-mount $ifi"2" $rootpath
-if [\! -f "$imagepath" ]
+mount $ofiroot $rootpath
+
+#Image ggf. downloaden
+if [ \! -f "$imagepath" ]
 	then
+		echo "Image wird gedownloadet..."		
 		wget http://os.archlinuxarm.org/os/ArchLinuxARM-rpi-2-latest.tar.gz
 fi
+
+echo "Die Root-Dateien werden auf die SD-Karte aufgespielt..."
 bsdtar -xpf $imagepath -C $rootpath
 sync
-mv $rootpath"/boot/*" $bootpath
+
+echo "Die Boot-Dateien werden auf die SD-Karte aufgespielt..."
+mv $rootpath"/boot/"* $bootpath
+
 echo "Script rauemt das Verzeichnis auf..."
 umount $rootpath $bootpath
 rm -r $rootpath