v6.26

+ DietPi-Software | Amiberry: Use name capitalisation that matches official website/docs + DietPi-Software | Amiberry: Re-enable experimental support for XU4, since it is Stretch now + DietPi-Software | Amiberry: Fix install on Buster+ due to "libsndio6.1" => "libsndio7.0" package switch + DietPi-Software | Amiberry: Minor coding, e.g. failsafe rekursiv userdata symlink estimation
MichaIng · Sep 11, 2019 · 4886c55 · 4886c55
1 parent 7031514
commit 4886c55
Showing 1 changed file with 23 additions and 25 deletions.
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
@@ -1109,7 +1109,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		#--------------------------------------------------------------------------------
 		software_id=108
 
-		aSOFTWARE_NAME[$software_id]='AmiBerry'
+		aSOFTWARE_NAME[$software_id]='Amiberry'
 		aSOFTWARE_DESC[$software_id]='amiga emulator'
 		aSOFTWARE_CATEGORY_INDEX[$software_id]=5
 		aSOFTWARE_TYPE[$software_id]=0
@@ -1124,10 +1124,10 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 			aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,$i]=0
 
 		done
-		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,52]=1 # + ASUS TB
-
+		# + ASUS TB
+		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,52]=1
 		# + XU4 test
-		#aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,11]=1 # Requires Stretch due to libc requirements
+		aSOFTWARE_AVAIL_G_HW_MODEL[$software_id,11]=1
 
 		#------------------
 		software_id=51
@@ -3926,7 +3926,8 @@ _EOF_
 			# Backup existing autostart.uae for user
 			G_BACKUP_FP $G_FP_DIETPI_USERDATA/amiberry/conf/autostart.uae
 
-			DEPS_LIST='libmpg123-0 libxml2 mpeg2dec libmpeg2-4 libsndio6.1'
+			DEPS_LIST='libmpg123-0 libxml2 mpeg2dec libmpeg2-4'
+			(( $G_DISTRO < 5 )) && DEPS_LIST+=' libsndio6.1' || DEPS_LIST+=' libsndio7.0'
 			Download_Install 'https://dietpi.com/downloads/binaries/all/amiberry_v2.25.7z' $G_FP_DIETPI_USERDATA
 
 		fi
@@ -8475,63 +8476,60 @@ _EOF_
 			# Allow binary execution
 			chmod -R +x $G_FP_DIETPI_USERDATA/amiberry
 
-			local amiberry_filename=0
+			local amiberry_filename
 			local capsimg_filename='capsimg-rpi.so'
 
-			# - ASUS TB
+			# ASUS TB
 			if (( $G_HW_MODEL == 52 )); then
 
 				amiberry_filename='amiberry-tinker'
 				capsimg_filename='capsimg-tinker.so'
 
-			# - XU4
+			# XU4
 			elif (( $G_HW_MODEL == 11 )); then
 
 				amiberry_filename='amiberry-xu4'
 				capsimg_filename='capsimg-xu4.so'
 
-			# - RPi 4
+			# RPi 4
 			elif (( $G_HW_MODEL == 4 )); then
 
 				:
 
-			# - RPi 3
+			# RPi 3
 			elif (( $G_HW_MODEL == 3 )); then
 
 				amiberry_filename='amiberry-rpi3-sdl2-dispmanx'
 
-			# - RPi 2
+			# RPi 2
 			elif (( $G_HW_MODEL == 2 )); then
 
 				amiberry_filename='amiberry-rpi2-sdl2-dispmanx'
 
-			# - Assume RPi 1 (ARMv6)
+			# Assume RPi 1 (ARMv6)
 			else
 
 				amiberry_filename='amiberry-rpi1-sdl2-dispmanx'
 
 			fi
 
-			# - Update capsimg.so
-			rm $G_FP_DIETPI_USERDATA/amiberry/capsimg.so &> /dev/null
-			mv $G_FP_DIETPI_USERDATA/amiberry/"$capsimg_filename" $G_FP_DIETPI_USERDATA/amiberry/capsimg.so
+			# Update capsimg.so
+			mv "$G_FP_DIETPI_USERDATA/amiberry/$capsimg_filename" $G_FP_DIETPI_USERDATA/amiberry/capsimg.so
 
-			# - Create additional user media directories
-			mkdir -p $G_FP_DIETPI_USERDATA/amiberry/floppy_images
-			mkdir -p $G_FP_DIETPI_USERDATA/amiberry/hdf
-			mkdir -p $G_FP_DIETPI_USERDATA/amiberry/cd
+			# Create additional user media directories
+			mkdir -p $G_FP_DIETPI_USERDATA/amiberry/{floppy_images,hdf,cd}
 
-			# Uae4arm does not support browsing symlinks (https://github.com/MichaIng/DietPi/issues/474#issuecomment-242973839)
-			#	So we need to change config file default paths to actual userdata location:
-			local fp_userdata_actual=$(readlink $G_FP_DIETPI_USERDATA) # Only returns a value if symlink exists (eg: off SDcard)
-			if [[ $fp_userdata_actual ]]; then
+			# Uae4arm does not support browsing symlinks: https://github.com/MichaIng/DietPi/issues/474#issuecomment-242973839
+			# - So we need to change config file default paths to actual userdata location:
+			if [[ -L $G_FP_DIETPI_USERDATA ]]; then
 
+				local fp_userdata_actual=$(readlink -f $G_FP_DIETPI_USERDATA)
 				sed -i "s:$G_FP_DIETPI_USERDATA:$fp_userdata_actual:g" $G_FP_DIETPI_USERDATA/amiberry/conf/adfdir.conf
 				sed -i "s:$G_FP_DIETPI_USERDATA:$fp_userdata_actual:g" $G_FP_DIETPI_USERDATA/amiberry/conf/autostart.uae
 
 			fi
 
-			# - Service
+			# Service
 			local exec_start="$G_FP_DIETPI_USERDATA/amiberry/$amiberry_filename -f $G_FP_DIETPI_USERDATA/amiberry/conf/autostart.uae"
 			if (( $G_HW_MODEL == 52 )); then
 
@@ -8541,7 +8539,7 @@ _EOF_
 
 			cat << _EOF_ > /etc/systemd/system/amiberry.service
 [Unit]
-Description=AmiBerry Amiga Emulator (DietPi)
+Description=Amiberry Amiga Emulator (DietPi)
 
 [Service]
 #StandardOutput=tty