od: od-update: Make OD beta -> OD beta upgrade working

Author: Kukunin

board/opendingux/opk_update_script.sh

@@ -107,10 +107,11 @@ clear
 echo 'Update in progress - please be patient.'
 echo
 
+echo "$DEVICE" > /tmp/_force_thisdevice
 if [ "$(whoami)" = "root" -a ! -x /usr/sbin/od-update ]; then
-	PATH=$(pwd):$PATH FORCE_DEVICE="$DEVICE" ./od-update $1
+	./od-update $1
 else
-	sudo PATH=$(pwd):$PATH FORCE_DEVICE="$DEVICE" od-update $1
+	sudo od-update $1
 fi
 
 # ----------

board/opendingux/target_skeleton/usr/bin/thisdevice

@@ -34,6 +34,8 @@ lepus;wolsen,ldkh     ;LDK (horizontal);lepus;ldkh;
 END
 )
 
+FORCE_DEVICE_FILE=/tmp/_force_thisdevice
+
 if [ $# -le 0 ]; then
 	display_usage
 	exit 1
@@ -116,7 +118,11 @@ case $1 in
 		echo 'DEVICE_STORAGE="'$STORAGE'"'
 		;;
 	--detect)
-		detect_device
+		if [ -r "$FORCE_DEVICE_FILE" ]; then
+			cat "$FORCE_DEVICE_FILE"
+		else
+			detect_device
+		fi
 		;;
 	*)
 		echo "invalid command $1 (-h will show valid options)" 1>&2

board/opendingux/target_skeleton/usr/sbin/od-update

@@ -1,20 +1,27 @@
 #!/bin/sh
 
-if [ $# -ne 1 ]; then
+if [ $# -lt 1 ]; then
 	echo -e "Incorrect number of parameters.
 Usage:
 \t$0 <data_dir>"
 	exit 1
 fi
 
-if [ -z "$FORCE_DEVICE" ]; then
-	DEVICE=$(thisdevice --detect)
-	[ -z "$DEVICE" ] && DEVICE=undetected
+if [ -x ./thisdevice ]; then
+	THISDEVICE=./thisdevice
 else
-	DEVICE="$FORCE_DEVICE"
+	THISDEVICE=$(which thisdevice 2> /dev/null)
 fi
 
-DEVICEINFO=$(thisdevice --device "$DEVICE" 2> /dev/null)
+if [ -z "$THISDEVICE" ]; then
+	echo "thisdevice utility can't be found"
+	exit 12
+fi
+
+DEVICE=$($THISDEVICE --detect)
+[ -z "$DEVICE" ] && DEVICE=undetected
+
+DEVICEINFO=$($THISDEVICE --device "$DEVICE" 2> /dev/null)
 if [ $? -ne 0 ] ; then
 	echo "Unknown device $DEVICE"
 	exit 12
@@ -26,13 +33,13 @@ BOOTLD=$1/ubiboot-$DEVICE_BOOTLOADER.bin
 DEVICETREE=$1/$DEVICE_DEVICETREE.dtb
 
 if [ ! -r "$BOOTLD" ]; then
-	echo "Bootloader $2 does not exists"
+	echo "Bootloader $DEVICE_BOOTLOADER does not exists"
 	exit 13
 fi
 
 [ ! -r $DEVICETREE ] && DEVICETREE=/sys/firmware/fdt
 if [ ! -r "$DEVICETREE" ]; then
-	echo "Device tree $3 does not exists"
+	echo "Device tree $DEVICE_DEVICETREE does not exists"
 	exit 14
 fi
 
@@ -99,7 +106,7 @@ if [ -r $ROOTFS -a "$0" != "/tmp/od-update" ] ; then
 			umount $MNT
 
 			# Run the updated od-update script from the rootfs
-			exec /tmp/od-update $*
+			exec /tmp/od-update "$@"
 		else
 			umount $MNT
 		fi