Merge pull request #32 from cjom/main

Rename essential system scripts

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -18,7 +18,7 @@ body:
         REG Linux version used.
         GUI: SYSTEM SETTINGS -> INFORMATION
         Terminal: cat /usr/share/reglinux/system.version
-        Or details can be obtained from batocera-info in your support file. (See logs below)
+        Or details can be obtained from system-info in your support file. (See logs below)
       placeholder: 39-dev-2da5edeea0 2024/02/03 03:28
     validations:
       required: true

board/fsoverlay/etc/init.d/S97update

@@ -55,8 +55,8 @@ function mountshareinternal() {
 	SHAREMOUNT="/tmp/SHARE_INTERNAL"
 	mkdir -p "$SHAREMOUNT"
 	PARTTYPE=$(blkid -o value -s TYPE "$SHAREPART")
-	echo "cmd: batocera-mount \"${PARTTYPE}\" 1 \"$SHAREPART\" \"$SHAREMOUNT\"" >>"$LOG"
-	if ! batocera-mount "${PARTTYPE}" 1 "$SHAREPART" "$SHAREMOUNT" >>"$LOG" 2>&1; then
+	echo "cmd: system-mount \"${PARTTYPE}\" 1 \"$SHAREPART\" \"$SHAREMOUNT\"" >>"$LOG"
+	if ! system-mount "${PARTTYPE}" 1 "$SHAREPART" "$SHAREMOUNT" >>"$LOG" 2>&1; then
 		echo "Error mounting SHARE partition!" >>"$LOG"
 		display_error
 	fi
@@ -112,7 +112,7 @@ if grep -qE '^[ ]*newbootuuid[ ]*=[ ]*true[ ]*$' "${BOOTCONF}"; then
 fi
 
 # Search for upgrade file to finish upgrading REG-linux
-SHAREPART=$(batocera-part share_internal)
+SHAREPART=$(system-part share_internal)
 SHAREMOUNT=$(grep -m 1 -E "^$SHAREPART " /proc/mounts | awk '{print $2}')
 [ -z "$SHAREMOUNT" ] && mountshareinternal
 
@@ -146,7 +146,7 @@ if [ "$TASKS" -ge 1000 ]; then
 
 	# Fix uuid
 	((CURRENTSTEP += 400))
-	BOOTPART=$(/usr/bin/batocera-part boot)
+	BOOTPART=$(/usr/bin/system-part boot)
 	NEWUUID=$(blkid -o value -s UUID "$BOOTPART")
 	if [ -n "$NEWUUID" ]; then
 		echo "Updating boot files with boot partition UUID" >>"$LOG"
@@ -162,7 +162,7 @@ fi
 # only when random UUID for boot partition is wanted (usually first boot only)
 if [ "$TASKS" -ge 100 ]; then
 
-	BOOTPART="$(/usr/bin/batocera-part boot)"
+	BOOTPART="$(/usr/bin/system-part boot)"
 
 	echo "Changing UUID of boot partition to a new random UUID" >>"$LOG"
 	((CURRENTSTEP += 50))
@@ -216,11 +216,11 @@ fi
 if [ "$TASKS" -ge 1 ]; then
 
 	# /userdata partition
-	PARTNUM=$(batocera-part "share_internal_num")
+	PARTNUM=$(system-part "share_internal_num")
 	echo "Partition name: $SHAREPART & number: $PARTNUM" >>"$LOG"
 
 	# boot disk
-	DISK=$(batocera-part prefix "${SHAREPART}")
+	DISK=$(system-part prefix "${SHAREPART}")
 	echo "Disk = $DISK" >>"$LOG"
 
 	# only for ext4

board/fsoverlay/etc/profile.d/25-language.sh

@@ -1,4 +1,4 @@
-settings_lang="$(/usr/bin/batocera-settings-get system.language || echo 'en_US')"
+settings_lang="$(system-settings-get system.language || echo 'en_US')"
 env_lang="${settings_lang}.UTF-8"
 if test -n $LANG; then
     echo "Set Language environment variable to - ${env_lang}"

board/fsoverlay/lib/udev/rules.d/usbmount.rules

@@ -1,11 +1,11 @@
 # Rules for USBmount -*- conf -*-
 
-KERNEL=="sd*",     DRIVERS=="sbp2",    ACTION=="add",    RUN+="/usr/bin/batocera-usbmount add"
-KERNEL=="sd*",     SUBSYSTEM=="block", ACTION=="add",    RUN+="/usr/bin/batocera-usbmount add"
-KERNEL=="ub*",     SUBSYSTEM=="block", ACTION=="add",    RUN+="/usr/bin/batocera-usbmount add"
-KERNEL=="mmcblk*", SUBSYSTEM=="block", ACTION=="add",    RUN+="/usr/bin/batocera-usbmount add"
-KERNEL=="nvme*",   SUBSYSTEM=="block", ACTION=="add",    RUN+="/usr/bin/batocera-usbmount add"
-KERNEL=="sd*",                         ACTION=="remove", RUN+="/usr/bin/batocera-usbmount remove"
-KERNEL=="ub*",                         ACTION=="remove", RUN+="/usr/bin/batocera-usbmount remove"
-KERNEL=="mmcblk*",                     ACTION=="remove", RUN+="/usr/bin/batocera-usbmount remove"
-KERNEL=="nvme*",                       ACTION=="remove", RUN+="/usr/bin/batocera-usbmount remove"
+KERNEL=="sd*",     DRIVERS=="sbp2",    ACTION=="add",    RUN+="/usr/bin/system-usbmount add"
+KERNEL=="sd*",     SUBSYSTEM=="block", ACTION=="add",    RUN+="/usr/bin/system-usbmount add"
+KERNEL=="ub*",     SUBSYSTEM=="block", ACTION=="add",    RUN+="/usr/bin/system-usbmount add"
+KERNEL=="mmcblk*", SUBSYSTEM=="block", ACTION=="add",    RUN+="/usr/bin/system-usbmount add"
+KERNEL=="nvme*",   SUBSYSTEM=="block", ACTION=="add",    RUN+="/usr/bin/system-usbmount add"
+KERNEL=="sd*",                         ACTION=="remove", RUN+="/usr/bin/system-usbmount remove"
+KERNEL=="ub*",                         ACTION=="remove", RUN+="/usr/bin/system-usbmount remove"
+KERNEL=="mmcblk*",                     ACTION=="remove", RUN+="/usr/bin/system-usbmount remove"
+KERNEL=="nvme*",                       ACTION=="remove", RUN+="/usr/bin/system-usbmount remove"

board/patches/usbmount/0003-ntfs3g.patch

@@ -7,7 +7,7 @@ index c09a865..7d89dbf 100755
  		# Mount the filesystem.
  		log info "executing command: mount -t$fstype ${options:+-o$options} $DEVNAME $mountpoint"
 -		mount "-t$fstype" "${options:+-o$options}" "$DEVNAME" "$mountpoint"
-+		batocera-mount "$fstype" 0 "${DEVNAME}" "${mountpoint}"
++		system-mount "$fstype" 0 "${DEVNAME}" "${mountpoint}"
 
  		# Determine vendor and model.
  		vendor=

board/patches/usbmount/004-usbmount-fancy-mount-points.patch

@@ -49,7 +49,7 @@ index 06102cd..27193f6 100755
  		# Mount the filesystem.
  		log info "executing command: mount -t$fstype ${options:+-o$options} $DEVNAME $mountpoint"
 +		mkdir -p "${mountpoint}"
- 		batocera-mount "$fstype" 0 "${DEVNAME}" "${mountpoint}"
+ 		system-mount "$fstype" 0 "${DEVNAME}" "${mountpoint}"
 
  		# Determine vendor and model.
 @@ -169,18 +182,16 @@ if [ "$1" = add ]; then

package/core/rescue-system/rescue-system.mk

@@ -44,9 +44,9 @@ define RESCUE_SYSTEM_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(BR2_EXTERNAL_RESCUE_PATH)/package/core/rescue-system/dbus.sh $(TARGET_DIR)/etc/profile.d/dbus.sh
 
     # Other scripts needed
-    $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_RESCUE_PATH)/package/core/rescue-system/batocera-mount $(TARGET_DIR)/usr/bin/
-    $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_RESCUE_PATH)/package/core/rescue-system/batocera-part $(TARGET_DIR)/usr/bin/
-    $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_RESCUE_PATH)/package/core/rescue-system/batocera-usbmount $(TARGET_DIR)/usr/bin/
+    $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_RESCUE_PATH)/package/core/rescue-system/system-mount $(TARGET_DIR)/usr/bin/
+    $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_RESCUE_PATH)/package/core/rescue-system/system-part $(TARGET_DIR)/usr/bin/
+    $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_RESCUE_PATH)/package/core/rescue-system/system-usbmount $(TARGET_DIR)/usr/bin/
 
 endef
 

package/core/rescue-system/batocera-mount → package/core/rescue-system/system-mount

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# batocera-mount [FSTYPE] [RWREQUIRED] [MOUNTDEVICE] [MOUNTPOINT]
+# system-mount [FSTYPE] [RWREQUIRED] [MOUNTDEVICE] [MOUNTPOINT]
 
 print_usage() {
     echo "${0} [FSTYPE] [RWREQUIRED] [MOUNTDEVICE] [MOUNTPOINT]" >&2