Merge branch 'master' of ableton-dir/openadk into master

1 files changed, 12 insertions, 6 deletions

diff --git a/scripts/install.sh b/scripts/install.sh
index dbdcfa6ad..04ae46989 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -192,15 +192,21 @@ case $ostype {
 	;;
 (Linux)
 	basedev=$tgt
-	rootpart=${basedev}1
-	datapart=${basedev}2
+	partitionsep=""
+	if [[ $basedev = /dev/loop* ]]; then
+		(( quiet )) || print "${tgt} is a loop device"
+		partitionsep=p
+	fi
+
+	rootpart=${basedev}${partitionsep}1
+	datapart=${basedev}${partitionsep}2
 	if [[ $target = raspberry-pi || $target = raspberry-pi2 || $target = raspberry-pi3 || $target = raspberry-pi3-64 ]]; then
-		bootpart=${basedev}1
-		rootpart=${basedev}2
-		datapart=${basedev}3
+		bootpart=${basedev}${partitionsep}1
+		rootpart=${basedev}${partitionsep}2
+		datapart=${basedev}${partitionsep}3
 	fi
 
-	match=\'${basedev}\''+([0-9])'
+	match=\'${basedev}${partitionsep}\''+([0-9])'
 	function mount_fs {
 		mount -t "$3" "$1" "$2"
 	}