Skip to content

Commit

Permalink
Windows installer: do not delete configuration on update
Browse files Browse the repository at this point in the history
This commit fixes a problem in the Windows installer.
Without this patch, on update, even with "keep old configuration" set,
it only keeps the configuration in the configuration directory
structure, like bareos-fd.d/, but deletes the legacy configuration
files like bareos-fd.conf.
  • Loading branch information
joergsteffens authored and pstorz committed Mar 17, 2017
1 parent 9babee3 commit 132bb75
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions platforms/win32/winbareos.nsi
Expand Up @@ -2080,12 +2080,19 @@ Section Uninstall

ConfDeleteSkip:
# delete config files *.conf.old and *.conf.new, ...
Delete "$APPDATA\${PRODUCT_NAME}\bareos-fd.conf.*"
Delete "$APPDATA\${PRODUCT_NAME}\bareos-sd.conf.*"
Delete "$APPDATA\${PRODUCT_NAME}\bareos-dir.conf.*"
Delete "$APPDATA\${PRODUCT_NAME}\tray-monitor.conf.*"
Delete "$APPDATA\${PRODUCT_NAME}\bconsole.conf.*"
Delete "$APPDATA\${PRODUCT_NAME}\bat.conf.*"
Delete "$APPDATA\${PRODUCT_NAME}\bareos-fd.conf.old"
Delete "$APPDATA\${PRODUCT_NAME}\bareos-sd.conf.old"
Delete "$APPDATA\${PRODUCT_NAME}\bareos-dir.conf.old"
Delete "$APPDATA\${PRODUCT_NAME}\tray-monitor.conf.old"
Delete "$APPDATA\${PRODUCT_NAME}\bconsole.conf.old"
Delete "$APPDATA\${PRODUCT_NAME}\bat.conf.old"

Delete "$APPDATA\${PRODUCT_NAME}\bareos-fd.conf.new"
Delete "$APPDATA\${PRODUCT_NAME}\bareos-sd.conf.new"
Delete "$APPDATA\${PRODUCT_NAME}\bareos-dir.conf.new"
Delete "$APPDATA\${PRODUCT_NAME}\tray-monitor.conf.new"
Delete "$APPDATA\${PRODUCT_NAME}\bconsole.conf.new"
Delete "$APPDATA\${PRODUCT_NAME}\bat.conf.new"

Delete "$INSTDIR\${PRODUCT_NAME}.url"
Delete "$INSTDIR\uninst.exe"
Expand Down

0 comments on commit 132bb75

Please sign in to comment.