make SetupHelper independent of Venus OS version

v2.66 doesn't support 'cat -n'
kwindrem · Oct 20, 2022 · fc2255e · fc2255e
1 parent 32362e4
commit fc2255e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion
@@ -1 +1 @@
-v4.28
+v4.29
diff --git a/changes b/changes
@@ -1,4 +1,4 @@
-v4.28:
+v4.28/v2.89:
 	make SetupHelper independent of Venus OS version
 
 v4.27:

diff --git a/setup b/setup
@@ -68,8 +68,7 @@ if [ $scriptAction == 'INSTALL' ] ; then
 		rm -f "/var/volatile/tmp/PageSettings.qml"
 		echo "//////// modified to insert PackageManager menu" > "/var/volatile/tmp/PageSettings.qml"
 		# find line with second to last }
-		#################insertBefore=$(awk '{print NR  " " $s}' "$origFile" | grep '}' | tail -2 | head -n 1 | awk '{print $1}')
-		insertBefore=$(cat -n "$origFile" | grep '}' | tail -2 | head -n 1 | awk '{print $1}')
+		insertBefore=$(awk '{print NR  " " $s}' "$origFile" | grep '}' | tail -2 | head -n 1 | awk '{print $1}')
 		((insertBefore -= 1))
 		# include all lines before that one
 		head -n $insertBefore $origFile >> "/var/volatile/tmp/PageSettings.qml"

diff --git a/venus-data.UninstallPackages.tar.gz b/venus-data.UninstallPackages.tar.gz
diff --git a/venus-data.tgz b/venus-data.tgz
diff --git a/version b/version
@@ -1 +1 @@
-v4.28
+v4.29