Merge pull request billw2#2 from martignoni/151-rpios

Update RPi OS logic detection (issue 152)

Author: framps

rpi-clone

@@ -27,18 +27,15 @@ then
     exit 1
 fi
 
-raspbian=0
-raspbian_buster=0
-if [ -f /etc/os-release ]
-then
-	pretty=`cat /etc/os-release | grep PRETTY`
-	if [[ "$pretty" == *"Raspbian"* ]]
-	then
-		raspbian=1
+rpios=0
+rpios_recent=0
+if [ -f /etc/os-release ]; then
+	if [[ -e /etc/rpi-issue ]]; then
+		rpios=1
 	fi
-	if ((raspbian)) && [[ "$pretty" == *"buster"* ]]
-	then
-		raspbian_buster=1
+	pretty="$(cat /etc/os-release | grep PRETTY)"
+	if ((rpios)) && [[ ! "$pretty" =~ wheezy|jessie|stretch ]]; then
+		rpios_recent=1
 	fi
 fi
 
@@ -1320,7 +1317,7 @@ Use -U for unattended even if initializing.
 		then
 			printf "%-22s : %s\n" " " \
 						"Possible options:"
-			if ((raspbian))
+			if ((rpios))
 			then
 				printf "%-22s : %s\n" " " \
 						"    Use -f2 to force a two partition initialize clone."
@@ -1345,7 +1342,7 @@ Use -U for unattended even if initializing.
 	printf "%-22s : %s\n" "** WARNING **" \
 			"All destination disk $dst_disk data will be overwritten!"
 
-	if ((raspbian_buster && p1_size_new == 0 && src_size_sectors[1] < 400000))
+	if ((rpios_recent && p1_size_new == 0 && src_size_sectors[1] < 400000))
 	then
 		printf "%-22s : %s\n" "** WARNING **" \
 			"Your source /boot partition is smaller than the"
@@ -1606,7 +1603,7 @@ else
 		exit 1
 	fi
 
-	if ((raspbian_buster && dst_size_sectors[1] < 500000))
+	if ((rpios_recent && dst_size_sectors[1] < 500000))
 	then
 		qprintf "%-22s : %s\n" "** WARNING **" \
 			"Your destination /boot partition is smaller than the"