rewrite to insure logging is all done via multilog

Author: kwindrem

FileSets/VersionIndependent/PageSettingsPackageEdit.qml

@@ -273,10 +273,10 @@ MbPage {
 			id: packageNameBox
 			text: packageName + " versions"
 		}
-		MbRowSmall
+		Row
 		{
-			description: " "
 			height: 25
+			leftPadding: 7; rightPadding: 5; spacing: 1
 			Text
 			{
 				text: "GitHub:"
@@ -287,23 +287,23 @@ MbPage {
 			{
 				id: gitHubVersion
 				item { bind: getServiceBind("GitHubVersion") }
-				height: 25; width: 105
+				height: 25; width: 112
 			}
 			Text
 			{
-				text: qsTr ("stored:")
+				text: qsTr (" stored:")
 				color: isCurrentItem ? root.style.textColorSelected : root.style.textColor
 				font.pixelSize: 10
 			}
 			MbTextBlock
 			{
 				id: packageVersion
 				item { bind: getServiceBind("PackageVersion") }
-				height: 25; width: 105
+				height: 25; width: 112
 			}
 			Text
 			{
-				text: qsTr ("installed:")
+				text: qsTr (" installed:")
 				color: isCurrentItem ? root.style.textColorSelected : root.style.textColor
 				horizontalAlignment: Text.AlignRight
 				font.pixelSize: 10
@@ -313,7 +313,7 @@ MbPage {
 				id: installedVersion
 				item { bind: getServiceBind("InstalledVersion") }
 				height: 25
-				width: 105
+				width: 112
 			}
 		}
 		MbEditBox

FileSets/VersionIndependent/PageSettingsPackageManager.qml

@@ -38,7 +38,7 @@ MbPage {
 				if (mediaStatus.valid && mediaStatus.value != "")
 					return mediaStatus.value
 				else if (showControls)
-					return pmStatus
+					return pmStatusItem.value
 				else
 					return lastStatus
 			}

HelperResources/CommonResources

@@ -1139,7 +1139,7 @@ endScript ()
 				chmod +x "$rcLocal"
 			elif  [ $(grep -c "SetupHelper" "$rcLocal") == 0 ]; then
 				logMessage "adding SetupHelper reinstall script to $rcLocal"
-				sed -e '2d' "$scriptDir/rcS.local" >> $rcLocal
+				sed -e '1,2d' "$scriptDir/rcS.local" >> $rcLocal
 			fi
 		fi
 	fi
@@ -1326,7 +1326,6 @@ fi
 
 # collect command line options
 reinstall=false
-force=false
 deferReboot=false
 deferGuiRestart=false
 userInteraction=true
@@ -1336,9 +1335,6 @@ while [ $# -gt 0 ]; do
 		"reinstall")
 			reinstall=true
 			;;
-		"force")
-			force=true
-			;;
 		"deferReboot")
 			deferReboot=true
 			;;
@@ -1357,7 +1353,7 @@ while [ $# -gt 0 ]; do
 			;;
 		"runFromPm")
 			runFromPm=true
-			logToConsole=false
+			logToConsole=false 
 			userInteraction=false
 			deferReboot=true
 			deferGuiRestart=true
@@ -1376,6 +1372,11 @@ done
 
 # do after logToConsole is enabled/disabled abvove
 logMessage "--- starting setup script $packageVersion action: $scriptAction"
+if ! $runFromPm && $logToConsole ; then
+	echo
+	echo "messages are NOT written to log file - only to console"
+	echo
+fi
 
 # packages that require options to proceed unattended
 # must include the optionsRequried flag file in their package directory
@@ -1413,10 +1414,8 @@ fi
 # called from reinstallMods at boot time
 if $reinstall ; then
     runningAtBoot=true
-    if $force ; then
-        scriptAction='INSTALL'
 	# not installed, do it now
-    elif (( installedVersionNumber == 0 )); then
+    if (( installedVersionNumber == 0 )); then
         scriptAction='INSTALL'
 	# check versions and install only if package version is newer than installed version
 	else
@@ -1547,31 +1546,33 @@ if [ $scriptAction != 'UNINSTALL' ]; then
 	checkPackageDependencies
 
 	# create patched files for files with VisibleItemModel for older Venus OS versions
-	versionStringToNumber "v3.00~14"
-	if (( $venusVersionNumber < $versionNumber )); then
-		logMessage "patching VisibleItemModel to VisualItemModel in all .qml replacements"
-		for file in ${fileListVersionIndependent[@]};  do
-			baseName=$( basename "$file" )
-			if ! [[ "$baseName" == *.qml ]]; then continue; fi
-			sourceFile="$versionIndependentFileSet/$baseName"
-			if ! [ -f "$sourceFile" ]; then continue; fi
-			if (( $(grep -c "VisibleItemModel" "$sourceFile") == 0 )); then continue; fi
-			sed -e 's/VisibleItemModel/VisualItemModel/' "$sourceFile" > "$tempFileDir/$baseName"
-		done
-	fi
+	if ! $installFailed ; then
+		versionStringToNumber "v3.00~14"
+		if (( $venusVersionNumber < $versionNumber )); then
+			logMessage "patching VisibleItemModel to VisualItemModel in all .qml replacements"
+			for file in ${fileListVersionIndependent[@]};  do
+				baseName=$( basename "$file" )
+				if ! [[ "$baseName" == *.qml ]]; then continue; fi
+				sourceFile="$versionIndependentFileSet/$baseName"
+				if ! [ -f "$sourceFile" ]; then continue; fi
+				if (( $(grep -c "VisibleItemModel" "$sourceFile") == 0 )); then continue; fi
+				sed -e 's/VisibleItemModel/VisualItemModel/' "$sourceFile" > "$tempFileDir/$baseName"
+			done
+		fi
 
-	# create patched files for all qml files for the change to QtQuick 2
-	versionStringToNumber "v3.60~18"
-	if (( $venusVersionNumber >= $versionNumber )); then
-		logMessage "patching QtQuick 1.1 to QtQuick 2 in all .qml replacements"
-		for file in ${fileListVersionIndependent[@]};  do
-			baseName=$( basename "$file" )
-			if ! [[ "$baseName" == *.qml ]]; then continue; fi
-			sourceFile="$versionIndependentFileSet/$baseName"
-			if ! [ -f "$sourceFile" ]; then continue; fi
-			if (( $(grep -c "QtQuick 1.1" "$sourceFile") == 0 )); then continue; fi
-			sed -e 's/QtQuick 1.1/QtQuick 2/' "$sourceFile" > "$tempFileDir/$baseName"
-		done
+		# create patched files for all qml files for the change to QtQuick 2
+		versionStringToNumber "v3.60~18"
+		if (( $venusVersionNumber >= $versionNumber )); then
+			logMessage "patching QtQuick 1.1 to QtQuick 2 in all .qml replacements"
+			for file in ${fileListVersionIndependent[@]};  do
+				baseName=$( basename "$file" )
+				if ! [[ "$baseName" == *.qml ]]; then continue; fi
+				sourceFile="$versionIndependentFileSet/$baseName"
+				if ! [ -f "$sourceFile" ]; then continue; fi
+				if (( $(grep -c "QtQuick 1.1" "$sourceFile") == 0 )); then continue; fi
+				sed -e 's/QtQuick 1.1/QtQuick 2/' "$sourceFile" > "$tempFileDir/$baseName"
+			done
+		fi
 	fi
 
 	# create the forward and reverse patched files
@@ -1591,7 +1592,7 @@ if [ $scriptAction != 'UNINSTALL' ]; then
 	#	rather than reverse patching the active file
 	#	this maintains compatibility with packages installed with older versions of SetupHelper
 
-	if ! $installFailed && ! [ -z "$fileListPatched" ];then
+	if ! $installFailed && ! [ -z "$fileListPatched" ]; then
 		patchErrors=()
 		for activeFile in ${fileListPatched[@]}; do
 			baseName=$( basename $activeFile )

HelperResources/EssentialResources

@@ -26,11 +26,6 @@ installedFilesDir="/etc/venus/installedModifications"
 installedFilesList="$installedFilesDir/installedFiles"-$packageName
 installedServicesList="$installedFilesDir/installedServices"-$packageName
 
-
-# obsolete - use installedVersion
-installedFlagPrefix="/etc/venus/inInstalled-"
-installedFlag="$installedFlagPrefix"$packageName
-
 # set up pointers to package files
 #	based on the actual package for compatibility with older packages
 pkgFileSets="$scriptDir/FileSets"
@@ -50,17 +45,25 @@ servicesDir="$scriptDir/services"
 # logToConsole to false AFTER sourcing EssentialResources
 logToConsole=true
 
+runFromPm=false
+
 # write a message to log file and console
 
 logMessage ()
 {
-    # to console
-    if $logToConsole ; then
+	# send to stdout if running from PackageManager
+	#	it will include the message in its log file
+	if $runFromPm ; then
+		echo "$shortScriptName: $*"
+	# to console
+    elif $logToConsole ; then
         echo "$*"
+    # to PackageManager log file if no other choices
+    #	NOTE: PackageManager's logger service will manage the log file size
+    #		however if it is not running /data could eventually fill up
+	else
+		echo "$shortScriptName: $*" | tai64n >> $logFile
     fi
-
-    # to setup helper log
-	echo "$shortScriptName: $*" | tai64n >> $logFile
 }
 
 # create log file and directory tree if it does not exist yet
@@ -72,12 +75,10 @@ if ! [ -e "$logDir" ]; then
 	logMessage "creating log file and directory"
 fi
 
+# remove old log file if it still exists
 oldLogFile="/var/log/SetupHelper"
 if [ -e "$oldLogFile" ]; then
-	if (( $( tail -5 "$oldLogFile" | grep -c "WARNING: this log file no longer used" ) == 0 )); then
-		echo "WARNING: this log file no longer used" >> "$oldLogFile"
-		echo "      SetupHelper now logged to /var/log/PackageManager/current" >> "$oldLogFile"
-	fi
+	rm -rf "$oldLogFile"
 fi
 
 
@@ -157,16 +158,15 @@ setInstallFailed ()
 	else
 		reason=EXIT_ERROR
 	fi
-	message="${@:2}"
-	if [ ! -z "$message" ]; then
-		installFailMessage="$message"
-		logMessage "ERROR: $message"
-		# if not running from console, output error to stderr
-		if ! $logToConsole ; then
-			echo "$message" >&2
+	installFailMessage="${@:2}"
+	if [ ! -z "$installFailMessage" ]; then
+		# output error to stderr if run from PackageManager
+		if $runFromPm ; then
+			echo "$installFailMessage" >&2
+		# otherwise output to log (and/or stdout/console)
+		else
+			logMessage "ERROR: $installFailMessage"
 		fi
-	else
-		installFailMessage=""
 	fi
 
 	if [ $scriptAction == 'UNINSTALL' ]; then
@@ -201,7 +201,7 @@ fi
 #	arbitrary minimum size of 3 MB
 # this needs to be called before root fs mods are made.
 #	CommonResources calls this but if you source a subset of helper resources
-#	that script needs to find a place to call updateRootToRW
+#	that script needs to find a place to call updateRootToReadWrite
 
 updateRootToReadWrite ()
 {
@@ -221,22 +221,18 @@ updateRootToReadWrite ()
 			elif [ -f /opt/victronenergy/swupdate-scripts/resize2fs.sh ]; then
 				/opt/victronenergy/swupdate-scripts/resize2fs.sh
 				availableSpace=$(df -m / | tail -1 | awk '{print $4}')
-				logMessage "remounting read-write root and resizing - $availableSpace MB now available"
+				logMessage "remounting root read-write and resizing - $availableSpace MB now available"
 			fi
 			# check to see if remount was successful
 			if (( $(mount | grep ' / ' | grep -c 'rw') == 0 )); then
 				setInstallFailed $EXIT_ROOT_FULL "ERROR: unable to remount root read-write - can't continue"
 			fi
 		# root already read-write, attempt to resize if space is limited (CCGX can't resize)
-		elif (( $availableSpace < $rootMinimumSize )); then
-			if [ "$machine" == "ccgx" ]; then
-				logMessage "can't resize root on CCGX"
-			else
-				if [ -f /opt/victronenergy/swupdate-scripts/resize2fs.sh ]; then
-					/opt/victronenergy/swupdate-scripts/resize2fs.sh
-					availableSpace=$(df -m / | tail -1 | awk '{print $4}')
-					logMessage "resized root - $availableSpace MB now available"
-				fi
+		elif (( $availableSpace < $rootMinimumSize )) && [ "$machine" != "ccgx" ]; then
+			if [ -f /opt/victronenergy/swupdate-scripts/resize2fs.sh ]; then
+				/opt/victronenergy/swupdate-scripts/resize2fs.sh
+				availableSpace=$(df -m / | tail -1 | awk '{print $4}')
+				logMessage "resized root - $availableSpace MB now available"
 			fi
 		fi
 	fi

HelperResources/LogHandler

@@ -1 +1,3 @@
 # dummy file to prevent failure with older package setup scripts
+
+# logging is now in EssentialResources