merge from origin

NSIS-Dev · Aug 6, 2016 · d4872ac · d4872ac
1 parent 3c16509
commit d4872ac
Show file tree

Hide file tree

Showing 27 changed files with 42 additions and 37 deletions.
diff --git a/Commands/DrunkenNSIS.sublime-completions b/Commands/DrunkenNSIS.sublime-completions
@@ -53,9 +53,9 @@
                 { "trigger": "%EnvStrRead", "contents": "ReadEnvStr \\$${1:user_var} \"${2:name}\"" },
                 { "trigger": "%ErrorsClear", "contents": "ClearErrors" },
                 { "trigger": "%ErrorTextFile", "contents": "FileErrorText \"${1:error_text}\"" },
-                { "trigger": "%ExecutionLevelRequest admin", "contents": "RequestExecutionLevel admin" },
+                { "trigger": "%ExecutionLevelRequest admin (default)", "contents": "RequestExecutionLevel admin" },
                 { "trigger": "%ExecutionLevelRequest highest", "contents": "RequestExecutionLevel highest" },
-                { "trigger": "%ExecutionLevelRequest none (default)", "contents": "RequestExecutionLevel none" },
+                { "trigger": "%ExecutionLevelRequest none", "contents": "RequestExecutionLevel none" },
                 { "trigger": "%ExecutionLevelRequest user", "contents": "RequestExecutionLevel user" },
                 { "trigger": "%ExecutionLevelRequest", "contents": "RequestExecutionLevel ${1:none|user|admin|highest}" },
                 { "trigger": "%FileCopy /FILESONLY", "contents": "CopyFiles /FILESONLY \"${1:filespec_on_destsys}\" \"${2:destination_path}\" ${3:[size_of_files_in_kb]}" },
@@ -110,9 +110,9 @@
                 { "trigger": "%InstDetailsShow nevershow", "contents": "ShowInstDetails nevershow" },
                 { "trigger": "%InstDetailsShow show", "contents": "ShowInstDetails show" },
                 { "trigger": "%InstDetailsShow", "contents": "ShowInstDetails hide|show|nevershow" },
-                { "trigger": "%LangString License rtf", "contents": "LicenseBkColor ${1:name} \\${LANG_${2:ENGLISH}\\} \"${3:license_path}.rtf\"" },
-                { "trigger": "%LangString License txt", "contents": "LicenseBkColor ${1:name} \\${LANG_${2:ENGLISH}\\} \"${3:license_path}.txt\"" },
-                { "trigger": "%LangString License", "contents": "LicenseBkColor ${1:name} \\${LANG_${2:ENGLISH}\\} \"${3:license_path}\"" },
+                { "trigger": "%LangStringLicense rtf", "contents": "LicenseLangString ${1:name} \\${LANG_${2:ENGLISH}\\} \"${3:license_path}.rtf\"" },
+                { "trigger": "%LangStringLicense txt", "contents": "LicenseLangString ${1:name} \\${LANG_${2:ENGLISH}\\} \"${3:license_path}.txt\"" },
+                { "trigger": "%LangStringLicense", "contents": "LicenseLangString ${1:name} \\${LANG_${2:ENGLISH}\\} \"${3:license_path}\"" },
                 { "trigger": "%LanguageFileLoad", "contents": "LoadLanguageFile \"${1:language_file}.nlf\"" },
                 { "trigger": "%LenStr", "contents": "StrLen \\$${1:user_var} \"${2:str}\"" },
                 { "trigger": "%MessageSend", "contents": "SendMessage \\$${1:HWND} ${2:msg} ${3:wparam} ${4:lparam}" },
@@ -171,7 +171,7 @@
                 { "trigger": "%SupportedOSManifest WinVista", "contents": "ManifestSupportedOS WinVista" },
                 { "trigger": "%SupportedOSManifest", "contents": "ManifestSupportedOS ${1:none|all|WinVista|Win7|Win8|{GUID}}" },
                 { "trigger": "%TextCompleted", "contents": "CompletedText \"${1:text}\"" },
-                { "trigger": "%TextCompleted", "contents": "ComponentText \"${1:text}\" \"${2:[subtext]}\" \"${3:[subtext2]}\"" },
+                { "trigger": "%TextComponent", "contents": "ComponentText \"${1:text}\" \"${2:[subtext]}\" \"${3:[subtext2]}\"" },
                 { "trigger": "%TextDetailsButton", "contents": "DetailsButtonText \"${1:text}\" " },
                 { "trigger": "%TextDir", "contents": "DirText \"${1:[text]}\" \"${2:[subtext]}\" \"${3:[browse_button_text]}\" \"${4:[browse_dlg_text]}\"" },
                 { "trigger": "%TextLicense", "contents": "LicenseText \"${1:text}\" \"${2:button_text}\"" },
@@ -197,8 +197,8 @@
                 { "trigger": "%VerifyDir auto (default)", "contents": "DirVerify auto" },
                 { "trigger": "%VerifyDir leave", "contents": "DirVerify leave" },
                 { "trigger": "%VerifyDir", "contents": "DirVerify ${1:auto|leave}" },
-                { "trigger": "%WaitExec $var", "contents": "ExecShell \"${1:command}\" \\$${2:user_var}" },
-                { "trigger": "%WaitExec", "contents": "ExecShell \"${1:command}\"" },
+                { "trigger": "%WaitExec $var", "contents": "ExecWait \"${1:command}\" \\$${2:user_var}" },
+                { "trigger": "%WaitExec", "contents": "ExecWait \"${1:command}\"" },
                 { "trigger": "%WindowEnable", "contents": "EnableWindow \\$${1:hwnd} ${2:1|0}" },
                 { "trigger": "%WindowFind", "contents": "FindWindow \\$${1:user_var} \"${2:windowclass}\"" },
                 { "trigger": "%WindowHide", "contents": "HideWindow" },
@@ -260,6 +260,11 @@
                 { "trigger": "%{UnlessElse}", "contents": "\\${ElseUnless} ${1:condition}" },
                 { "trigger": "%{WhileEnd}", "contents": "\\${ExitWhile}" },
                 { "trigger": "%{WhileExit}", "contents": "\\${ExitWhile}" },
+
+                { "#": "Deprecated" },
+                { "trigger": "%SubSection", "contents": "SectionGroup ${1:section_group_name} ${2:index_output}\n\t${3:# your code here}\nSectionGroupEnd" },
+                { "trigger": "%SubSectionEnd", "contents": "SectionGroupEnd" },
+                { "trigger": "%{IsServer}", "contents": "\\${IsServerOS}" },
 
                 { "note": "It ain't over 'til the fat lady sings" }
         ]

diff --git a/Commands/NSIS.sublime-completions b/Commands/NSIS.sublime-completions
@@ -169,7 +169,7 @@
                 { "trigger": "HIDDEN or FILE_ATTRIBUTE_HIDDEN", "contents": "HIDDEN" },
                 { "trigger": "HKCR or HKEY_CLASSES_ROOT", "contents": "HKCR" },
                 { "trigger": "HKCU or HKEY_CURRENT_USER", "contents": "HKCU" },
-                { "trigger": "HKDD or HKEY_CURRENT_CONFIG", "contents": "HKDD" },
+                { "trigger": "HKCC or HKEY_CURRENT_CONFIG", "contents": "HKCC" },
                 { "trigger": "HKLM or HKEY_LOCAL_MACHINE", "contents": "HKLM" },
                 { "trigger": "HKDD or HKEY_DYN_DATA", "contents": "HKDD" },
                 { "trigger": "HKPD or HKEY_PERFORMANCE_DATA", "contents": "HKPD" },
@@ -524,9 +524,9 @@
                 { "trigger": "RegDLL", "contents": "RegDLL \"${1:dllfile}\" ${2:entrypoint_name}" },
                 { "trigger": "Rename /REBOOTOK", "contents": "Rename /REBOOTOK \"${1:source_file}\" \"${2:dest_file}\"" },
                 { "trigger": "Rename", "contents": "Rename \"${1:source_file}\" \"${2:dest_file}\"" },
-                { "trigger": "RequestExecutionLevel admin", "contents": "RequestExecutionLevel admin" },
+                { "trigger": "RequestExecutionLevel admin  (default)", "contents": "RequestExecutionLevel admin" },
                 { "trigger": "RequestExecutionLevel highest", "contents": "RequestExecutionLevel highest" },
-                { "trigger": "RequestExecutionLevel none  (default)", "contents": "RequestExecutionLevel none" },
+                { "trigger": "RequestExecutionLevel none", "contents": "RequestExecutionLevel none" },
                 { "trigger": "RequestExecutionLevel user", "contents": "RequestExecutionLevel user" },
                 { "trigger": "RequestExecutionLevel", "contents": "RequestExecutionLevel ${1:admin|none|user|highest}" },
                 { "trigger": "ReserveFile /nonfatal /r", "contents": "ReserveFile nonfatal/r \"${1:file}\"" },
@@ -1156,7 +1156,7 @@
                 { "trigger": "${AtMostWinVista}", "contents": "\\${AtMostWinVista}" },
                 { "trigger": "${AtMostWinXP}", "contents": "\\${AtMostWinXP}" },
                 { "trigger": "${IsNT}", "contents": "\\${IsNT}" },
-                { "trigger": "${IsServer}", "contents": "\\${IsServer}" },
+                { "trigger": "${IsServerOS}", "contents": "\\${IsServerOS}" },
                 { "trigger": "${IsServicePack}", "contents": "\\${IsServicePack}" },
                 { "trigger": "${IsWin10}", "contents": "\\${IsWin10}" },
                 { "trigger": "${IsWin2000}", "contents": "\\${IsWin2000}" },

diff --git a/Snippets/scaffold.Basic Script (2 Sections).sublime-snippet b/Snippets/scaffold.Basic Script (2 Sections).sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.Basic Script (2 Sections, onInit).sublime-snippet b/Snippets/scaffold.Basic Script (2 Sections, onInit).sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.Basic Script (3 Sections).sublime-snippet b/Snippets/scaffold.Basic Script (3 Sections).sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.Basic Script (3 Sections, onInit).sublime-snippet b/Snippets/scaffold.Basic Script (3 Sections, onInit).sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.Basic Script (4 Sections).sublime-snippet b/Snippets/scaffold.Basic Script (4 Sections).sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.Basic Script (4 Sections, onInit).sublime-snippet b/Snippets/scaffold.Basic Script (4 Sections, onInit).sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.Basic Script (onInit).sublime-snippet b/Snippets/scaffold.Basic Script (onInit).sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.Basic Script.sublime-snippet b/Snippets/scaffold.Basic Script.sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.InstallOptions.sublime-snippet b/Snippets/scaffold.InstallOptions.sublime-snippet
@@ -5,7 +5,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Includes ---------------------------------

diff --git a/Snippets/scaffold.MUI Script (2 Sections).sublime-snippet b/Snippets/scaffold.MUI Script (2 Sections).sublime-snippet
@@ -8,7 +8,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.MUI Script (2 Sections, onInit).sublime-snippet b/Snippets/scaffold.MUI Script (2 Sections, onInit).sublime-snippet
@@ -8,7 +8,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.MUI Script (3 Sections).sublime-snippet b/Snippets/scaffold.MUI Script (3 Sections).sublime-snippet
@@ -8,7 +8,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.MUI Script (3 Sections, onInit).sublime-snippet b/Snippets/scaffold.MUI Script (3 Sections, onInit).sublime-snippet
@@ -8,7 +8,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.MUI Script (4 Sections).sublime-snippet b/Snippets/scaffold.MUI Script (4 Sections).sublime-snippet
@@ -8,7 +8,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.MUI Script (4 Sections, onInit).sublime-snippet b/Snippets/scaffold.MUI Script (4 Sections, onInit).sublime-snippet
@@ -8,7 +8,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.MUI Script (onInit).sublime-snippet b/Snippets/scaffold.MUI Script (onInit).sublime-snippet
@@ -8,7 +8,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.MUI Script.sublime-snippet b/Snippets/scaffold.MUI Script.sublime-snippet
@@ -8,7 +8,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.nsDialogs MUI Script (2 Sections).sublime-snippet b/Snippets/scaffold.nsDialogs MUI Script (2 Sections).sublime-snippet
@@ -10,7 +10,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.nsDialogs MUI Script (3 Sections).sublime-snippet b/Snippets/scaffold.nsDialogs MUI Script (3 Sections).sublime-snippet
@@ -10,7 +10,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.nsDialogs MUI Script (4 Sections).sublime-snippet b/Snippets/scaffold.nsDialogs MUI Script (4 Sections).sublime-snippet
@@ -10,7 +10,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.nsDialogs MUI Script.sublime-snippet b/Snippets/scaffold.nsDialogs MUI Script.sublime-snippet
@@ -10,7 +10,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.nsDialogs Script (2 Sections).sublime-snippet b/Snippets/scaffold.nsDialogs Script (2 Sections).sublime-snippet
@@ -9,7 +9,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.nsDialogs Script (3 Sections).sublime-snippet b/Snippets/scaffold.nsDialogs Script (3 Sections).sublime-snippet
@@ -9,7 +9,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.nsDialogs Script (4 Sections).sublime-snippet b/Snippets/scaffold.nsDialogs Script (4 Sections).sublime-snippet
@@ -9,7 +9,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------

diff --git a/Snippets/scaffold.nsDialogs Script.sublime-snippet b/Snippets/scaffold.nsDialogs Script.sublime-snippet
@@ -9,7 +9,7 @@
 ; Settings ---------------------------------
 Name "${1:installer_name}"
 OutFile "${2:${1}}.exe"
-RequestExecutionLevel ${3:user}
+RequestExecutionLevel ${3:admin}
 InstallDir "\$PROGRAMFILES\\${4:${1}}"
 
 ; Pages ------------------------------------