diff --git a/HelperResources/CommonResources b/HelperResources/CommonResources index bec35e8..8976c8f 100755 --- a/HelperResources/CommonResources +++ b/HelperResources/CommonResources @@ -451,7 +451,6 @@ updateActiveFile () # do this before actually modifying things just in case there's an error # that way the uninstall is assured echo "$activeFile" >> "$installedFilesList" - cp "$sourceFile" "$activeFile" updateRestartFlags "$activeFile" @@ -1352,9 +1351,10 @@ if [ $scriptAction != 'UNINSTALL' ]; then for file in ${fileListVersionIndependent[@]}; do if ! [ -f "$file" ]; then continue; fi baseName=$( basename "$file" ) - if ! [ "$baseName" == *.qml ]; then continue; fi - if (( $(grep -c "VisibleItemModel" "$file") == 0 )); then continue; fi - sed -e 's/VisibleItemModel/VisualItemModel/' "$file" > "$patchedFiles/$baseName" + sourceFile="$versionIndependentFileSet/$baseName" + if ! [[ "$baseName" == *.qml ]]; then continue; fi + if (( $(grep -c "VisibleItemModel" "$sourceFile") == 0 )); then continue; fi + sed -e 's/VisibleItemModel/VisualItemModel/' "$sourceFile" > "$patchedFiles/$baseName" done fi diff --git a/HelperResources/version b/HelperResources/version index 185285a..d6c2490 100644 --- a/HelperResources/version +++ b/HelperResources/version @@ -1 +1 @@ -v6.0 +v6.1 diff --git a/changes b/changes index 86ee969..439c77d 100644 --- a/changes +++ b/changes @@ -1,3 +1,6 @@ +v3.1: + bump version to make sure package reinstalls after v6.1 changes + v3.0: add support for SetupHelper v6.0 diff --git a/version b/version index d9fb9c7..8616689 100644 --- a/version +++ b/version @@ -1 +1 @@ -v3.0 +v3.1