diff --git a/FileSets/MbDisplayPackageVersion.qml b/FileSets/MbDisplayPackageVersion.qml index 5d81e6f..fc18e11 100644 --- a/FileSets/MbDisplayPackageVersion.qml +++ b/FileSets/MbDisplayPackageVersion.qml @@ -103,6 +103,7 @@ MbItem { Text { text: statusText () + color: isCurrentItem ? root.style.textColorSelected : root.style.textColor font.pixelSize: 10 horizontalAlignment: Text.AlignLeft } diff --git a/changes b/changes index 6c9df9c..6b41cdb 100644 --- a/changes +++ b/changes @@ -1,3 +1,7 @@ +v5.5: + fixed: status text in Active packages menu is black - should be white + updateFileSets: fixed: reported no package errors when there were some + v5.3 / v5.4: updateFileSets: fixed: stale symlinks not removed updateFileSets: remove existing file sets that only contain sym links diff --git a/setup b/setup index b2edb6a..f5dbbfc 100755 --- a/setup +++ b/setup @@ -11,9 +11,9 @@ source "/data/SetupHelper/CommonResources" #### end of lines to include SetupHelper -# remove settings no longer used +# remove settings that are no longer used -cleanup () +function cleanup () { # cleanup from older versions restoreActiveFile "$qmlDir/PageSettingsPackageControl.qml" diff --git a/updateFileSets b/updateFileSets index 9842c4f..c1d5b5b 100755 --- a/updateFileSets +++ b/updateFileSets @@ -152,6 +152,7 @@ done versionList=( $(echo ${tempList[@]} | tr ' ' '\n' | sort -t ':' -r -n -k 2 | uniq ) ) for package in $packageList; do + packageErrors=0 if [ ! -d "$packageRoot/$package" ] || [ ! -f "$packageRoot/$package/version" ]; then logMessage "$packageRoot/$package - not a package directory" continue @@ -198,7 +199,6 @@ for package in $packageList; do # process versions in stock files for entry1 in ${versionList[@]} ; do - packageErrors=0 IFS=':' read version1 version1number <<< "$entry1" fileSet1="$packageFiles/$version1" @@ -470,10 +470,30 @@ for package in $packageList; do logMessage "$package: $packageErrors ERRORS" else logMessage "$package: no errors" - echo "foo" >/dev/null fi done # for package +# review all file sets and report any that only contain sym links across all packages +# it would be possile to remove those verions from stock files without loosing any data +# this check is only done if updating all file sets and there are no errors +if $doAllPackages && [ "$totalErrors" == 0 ]; then + logMessage "checking for versions that contain no actual replacement files" + for entry in ${versionList[@]} ; do + IFS=':' read version versionNumber <<< "$entry" + linksOnly=true + for package in $packageList; do + fileSet="$packageRoot/$package/FileSets/$version" + if [ ! -e "$fileSet/LINKS_ONLY" ]; then + linksOnly=false + break + fi + done + if $linksOnly ; then + logMessage "$version: only links in all packages" + fi + done +fi + if [ "$totalErrors" == 0 ]; then errorText="no errors " else diff --git a/version b/version index 2f997ec..4ef789b 100644 --- a/version +++ b/version @@ -1 +1 @@ -v5.4 +v5.5