Skip to content

Commit

Permalink
fixed: status text in Active packages menu is black - should be white
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed Sep 9, 2023
1 parent b1e1215 commit 442ef8a
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 5 deletions.
1 change: 1 addition & 0 deletions FileSets/MbDisplayPackageVersion.qml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ MbItem {
Text
{
text: statusText ()
color: isCurrentItem ? root.style.textColorSelected : root.style.textColor
font.pixelSize: 10
horizontalAlignment: Text.AlignLeft
}
Expand Down
4 changes: 4 additions & 0 deletions changes
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
24 changes: 22 additions & 2 deletions updateFileSets
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v5.4
v5.5

0 comments on commit 442ef8a

Please sign in to comment.