Merge branch 'upstream' of git.debian.org:/git/collab-maint/smartmontools into upstream

[mirror_smartmontools-debian.git] / os_win32 / installer.nsi

diff --git a/os_win32/installer.nsi b/os_win32/installer.nsi
index 78ce0145279047fdb7198798eaca9a128d878f23..6ac484326d0e69e28d10f18440d39a7f34a8f26c 100644 (file)
--- a/os_win32/installer.nsi
+++ b/os_win32/installer.nsi
@@ -13,7 +13,11 @@
 ; You should have received a copy of the GNU General Public License
 ; (for example COPYING); If not, see <http://www.gnu.org/licenses/>.
 ;
+<<<<<<< HEAD
 ; $Id: installer.nsi 4174 2015-11-22 16:19:29Z chrfranke $
+=======
+; $Id: installer.nsi 4072 2015-04-28 20:35:15Z chrfranke $
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 ;
 
 
@@ -717,6 +721,7 @@ Function AddToPath
   System::Call "advapi32::RegQueryValueEx(i $3, t'PATH', i 0, i 0, t.r1, *i ${NSIS_MAX_STRLEN} r2) i.r4"
   System::Call "advapi32::RegCloseKey(i $3)"
 
+<<<<<<< HEAD
   ${If} $4 = 234 ; ERROR_MORE_DATA
     DetailPrint "AddToPath: original length $2 > ${NSIS_MAX_STRLEN}"
     MessageBox MB_OK "PATH not updated, original length $2 > ${NSIS_MAX_STRLEN}" /SD IDOK
@@ -730,6 +735,18 @@ Function AddToPath
     ${EndIf}
     StrCpy $1 ""
   ${EndIf}
+=======
+  IntCmp $4 234 0 +4 +4 ; $4 == ERROR_MORE_DATA
+    DetailPrint "AddToPath: original length $2 > ${NSIS_MAX_STRLEN}"
+    MessageBox MB_OK "PATH not updated, original length $2 > ${NSIS_MAX_STRLEN}"
+    Goto done
+
+  IntCmp $4 0 +5 ; $4 != NO_ERROR
+    IntCmp $4 2 +3 ; $4 != ERROR_FILE_NOT_FOUND
+      DetailPrint "AddToPath: unexpected error code $4"
+      Goto done
+    StrCpy $1 ""
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
   ; Check if already in PATH
   Push "$1;"
@@ -748,11 +765,18 @@ Function AddToPath
   StrLen $3 $1
   IntOp $2 $2 + $3
   IntOp $2 $2 + 2 ; $2 = strlen(dir) + strlen(PATH) + sizeof(";")
+<<<<<<< HEAD
   ${If} $2 > ${NSIS_MAX_STRLEN}
     DetailPrint "AddToPath: new length $2 > ${NSIS_MAX_STRLEN}"
     MessageBox MB_OK "PATH not updated, new length $2 > ${NSIS_MAX_STRLEN}." /SD IDOK
     Goto done
   ${EndIf}
+=======
+  IntCmp $2 ${NSIS_MAX_STRLEN} +4 +4 0
+    DetailPrint "AddToPath: new length $2 > ${NSIS_MAX_STRLEN}"
+    MessageBox MB_OK "PATH not updated, new length $2 > ${NSIS_MAX_STRLEN}."
+    Goto done
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
   ; Append dir to PATH
   DetailPrint "Add to PATH: $0"