Skip to content

Commit

Permalink
fixed: PackageManager isn't in menus after v5.14 install
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed Nov 21, 2023
1 parent d8ac2d4 commit 3f44de0
Show file tree
Hide file tree
Showing 9 changed files with 1,749 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CommonResources
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ updateActiveFile ()
logMessage "ERROR: specified soure file $sourceFile does not exist - can't continue with install"
scriptAction='UNINSTALL'
installFailed=true
return
fi
return
destinationFile="$2"
# use active file for both source and destination
else
Expand Down
2 changes: 1 addition & 1 deletion blindInstall/SetupHelperVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v5.14
v5.15
4 changes: 4 additions & 0 deletions changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v5.15:
fixed: PackageManager isn't in menus after v5.14 install
updateFileSets: fixed: NO_REPLACEMENT in existing file sets that should link to other sets

v5.14:
v5.13 did not include blind install

Expand Down
6 changes: 3 additions & 3 deletions updateFileSets
Original file line number Diff line number Diff line change
Expand Up @@ -526,14 +526,15 @@ for package in $packageList; do
previousLink="../$version2/$baseName"
checkLinks=true
fi
elif $useOrigFlag2 ; then #################### is not working
elif $useOrigFlag2 ; then
if $replacement1exists ; then
logMessage "ERROR $package $basename file in $version1 conflicts with USE_ORIGINAL in $version2"
touch "$fileSet1/$baseName.CHECK_REPLACEMENT"
touch "$fileSet2/$baseName.CHECK_REPLACEMENT"
else
touch "$replacement1.USE_ORIGINAL"
rm -f "$replacement1"
touch "$replacement2.USE_ORIGINAL"
checkLinks=true
fi
fi
Expand All @@ -556,7 +557,6 @@ for package in $packageList; do
elif ! $useOrigFlag2 ; then
touch "$replacement2.USE_ORIGINAL"
rm -f "$replacement2"
logMessage "#### $baseName setting USE_ORIGINAL v2 $version2"
fi
if $replacement2isRealFile ; then
logMessage "ERROR $package $baseName $verson1 has file but matches $version1 with USE_ORIGINAL set"
Expand All @@ -573,7 +573,7 @@ logMessage "#### $baseName setting USE_ORIGINAL v2 $version2"
replacement1="$fileSet1/$baseName"
replacement1isRealFile=false
useOrigFlag1=false
if [ -f "$replacement1" ] && [ -L "$replacement1" ]; then
if [ -f "$replacement1" ] && [ ! -L "$replacement1" ]; then
replacement1isRealFile=true
elif [ -f "$replacement1.USE_ORIGINAL" ]; then
useOrigFlag1=true
Expand Down
Loading

0 comments on commit 3f44de0

Please sign in to comment.