From 9a47586141891e5f2b6fcdb1c0513a704289c06f Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 31 Jul 2020 20:07:43 +0000 Subject: [PATCH] use https git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7196 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/testlink.ini | 4 ++-- Contrib/Makensisw/makensisw.h | 8 ++++---- Contrib/System/System.html | 12 ++++++------ Docs/src/basic.but | 2 +- Docs/src/build.but | 2 +- Docs/src/config.but | 4 ++-- Docs/src/headers.but | 16 ++++++++-------- Docs/src/history.but | 8 ++++---- Docs/src/intro.but | 2 +- Docs/src/library.but | 2 +- Docs/src/tutorial.but | 2 +- Docs/src/usefulfunc.but | 4 ++-- Docs/src/var.but | 2 +- Examples/NSISMenu.nsi | 2 +- Examples/makensis.nsi | 6 +++--- Include/Sections.nsh | 2 +- Include/VB6RunTime.nsh | 2 +- Menu/index.html | 6 +++--- README.md | 6 +++--- Scripts/release.py | 4 ++-- 20 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Contrib/InstallOptions/testlink.ini b/Contrib/InstallOptions/testlink.ini index 278a4f91..9a071d4b 100644 --- a/Contrib/InstallOptions/testlink.ini +++ b/Contrib/InstallOptions/testlink.ini @@ -32,8 +32,8 @@ Left=20 Right=-40 Top=70 Bottom=80 -State=http://nsis.sourceforge.net/ -Text=* Homepage http://nsis.sourceforge.net/ +State=https://nsis.sourceforge.io/ +Text=* Homepage https://nsis.sourceforge.io/ [Field 5] Type=Text diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h index f3c9d815..c6a0e117 100644 --- a/Contrib/Makensisw/makensisw.h +++ b/Contrib/Makensisw/makensisw.h @@ -39,10 +39,10 @@ #define SupportsW95() ( FALSE && SupportsW9X() && !DpiAwarePerMonitor() ) // Defines -#define NSIS_URL "http://nsis.sourceforge.net/" +#define NSIS_URL "https://nsis.sourceforge.io/" #define NSIS_FORUM_URL "http://forums.winamp.com/forumdisplay.php?forumid=65" -#define NSIS_UC_URL "http://nsis.sourceforge.net/update.php?version=" -#define NSIS_DL_URL "http://nsis.sourceforge.net/download/" +#define NSIS_UC_URL "https://nsis.sourceforge.io/update.php?version=" +#define NSIS_DL_URL "https://nsis.sourceforge.io/download/" #ifdef UNICODE #define USAGE _T("Usage:\r\n\r\n \x2022 File \x203a Load Script...\r\n \x2022 Drag the .nsi file into this window\r\n \x2022 Right click the .nsi file and choose \"Compile NSIS Script\"\r\n") #else @@ -52,7 +52,7 @@ #define CONTRIB _T("Fritz Elfert, Justin Frankel, Amir Szekely, Sunil Kamath, Joost Verburg, Anders Kjersem") #define DONATE _T("Donate to support NSIS development.") #define DONATEURL { 'h'|x,'t','t'|x,'p',':'|x,'/'|x,'/'|x,'n'|x,'s'|x,'i'|x,'s'|x,'.'|x,'s'|x,'f'|x,'.','n'|x,'e'|x,'t'|x,'/'|x,'r','/'|x,'D'|x,'o'|x,'n'|x,'a'|x,'t'|x,'e'|x,'\0' } // "Encrypted" -#define DOCPATH "http://nsis.sourceforge.net/Docs/" +#define DOCPATH "https://nsis.sourceforge.io/Docs/" #define LOCALDOCS _T("\\NSIS.chm") #define ERRBOXTITLE 0 //_T("Error") #define NSISERROR _T("Unable to intialize MakeNSIS. Please verify that makensis.exe is in the same directory as makensisw.exe.") diff --git a/Contrib/System/System.html b/Contrib/System/System.html index 0aa97c4f..ffa1a262 100644 --- a/Contrib/System/System.html +++ b/Contrib/System/System.html @@ -36,12 +36,12 @@

Usage Examples From The Wiki

Available Functions

diff --git a/Docs/src/basic.but b/Docs/src/basic.but index c17268fb..ab52f640 100644 --- a/Docs/src/basic.but +++ b/Docs/src/basic.but @@ -156,7 +156,7 @@ The next example will succeed in deleting the directory. \c RMDir $TEMP\dir \NsisWarnBlockContainerBegin -\\Warning:\\ Using \e{RMDir /r $INSTDIR} in the uninstaller is not safe. Though it is unlikely, the user might select to install to the root of the Program Files folder and this command would wipe out the entire Program Files folder, including all other installed programs! The user can also put other files in the installation folder and wouldn't expect them to get deleted along with the program. Solutions are \W{http://nsis.sourceforge.net/Uninstall_only_installed_files}{available} for easily uninstalling only files which were installed by the installer. +\\Warning:\\ Using \e{RMDir /r $INSTDIR} in the uninstaller is not safe. Though it is unlikely, the user might select to install to the root of the Program Files folder and this command would wipe out the entire Program Files folder, including all other installed programs! The user can also put other files in the installation folder and wouldn't expect them to get deleted along with the program. Solutions are \W{https://nsis.sourceforge.io/Uninstall_only_installed_files}{available} for easily uninstalling only files which were installed by the installer. \NsisWarnBlockContainerEnd \NsisWarnBlockContainerBegin diff --git a/Docs/src/build.but b/Docs/src/build.but index 0545f7be..a9fd4dc0 100644 --- a/Docs/src/build.but +++ b/Docs/src/build.but @@ -119,4 +119,4 @@ To build a native version of NSIS Menu, install \W{http://www.wxwidgets.org/}{wx \H{build_nightly} Nightly Builds -There is no need to manually build the latest SVN version for Windows. A \W{http://nsis.sourceforge.net/nightly/nsis.zip}{nightly build} is available. The nightly build is automatically generated every night, using the latest version of the source code from SVN. There is no official nightly build for other platforms. +There is no need to manually build the latest SVN version for Windows. A \W{https://nsis.sourceforge.io/nightly/nsis.zip}{nightly build} is available. The nightly build is automatically generated every night, using the latest version of the source code from SVN. There is no official nightly build for other platforms. diff --git a/Docs/src/config.but b/Docs/src/config.but index d9dd1d6f..dc3e410f 100644 --- a/Docs/src/config.but +++ b/Docs/src/config.but @@ -6,9 +6,9 @@ \copyright \NsisCopyright -\preamble Check \W{http://nsis.sourceforge.net/}{http://nsis.sf.net} for news, information, support, examples, tutorials and more. +\preamble Check \W{https://nsis.sourceforge.io/}{http://nsis.sf.net} for news, information, support, examples, tutorials and more. -\preamble Quick links:\\\W{http://nsis.sourceforge.net/support/faq/}{FAQ} - A list of frequently asked questions\\\W{http://nsis.sourceforge.net/wiki/}{NSIS Wiki} - Examples, functions, tutorials, plug-ins, software and more\\\W{http://forums.winamp.com/forumdisplay.php?forumid=65}{Forum} - Post questions or discuss NSIS features +\preamble Quick links:\\\W{https://nsis.sourceforge.io/support/faq/}{FAQ} - A list of frequently asked questions\\\W{https://nsis.sourceforge.io/wiki/}{NSIS Wiki} - Examples, functions, tutorials, plug-ins, software and more\\\W{http://forums.winamp.com/forumdisplay.php?forumid=65}{Forum} - Post questions or discuss NSIS features \define{NsisFuncReqU} This function is only available when building a \R{intro-unicode}{Unicode installer}. diff --git a/Docs/src/headers.but b/Docs/src/headers.but index 178bf4cc..f59d39ea 100644 --- a/Docs/src/headers.but +++ b/Docs/src/headers.but @@ -263,7 +263,7 @@ Call functions: \c Push $0 \c FunctionEnd -\\Example (Locate with banner - \W{http://nsis.sourceforge.net/Nxs_plug-in}{NxS plugin} required):\\ +\\Example (Locate with banner - \W{https://nsis.sourceforge.io/Nxs_plug-in}{NxS plugin} required):\\ \c Section \c nxs::Show /NOUNLOAD `$(^Name) Setup` /top \ @@ -839,7 +839,7 @@ Call functions: \c Push $0 \c FunctionEnd -\\Example (\W{http://nsis.sourceforge.net/Nxs_plug-in}{NxS plugin}):\\ +\\Example (\W{https://nsis.sourceforge.io/Nxs_plug-in}{NxS plugin}):\\ \c !include "FileFunc.nsh" \c @@ -2382,17 +2382,17 @@ Call functions: \\Example (Filter4):\\ \c Section -\c ${StrFilter} "123abcÀÁ 456DEFãäå 7890|%#" "+12rus" "ä" "ãå" $R0 -\c ; $R0="123ÀÁÂ456ä7890" ;only Digits + Letters + ä - ãå +\c ${StrFilter} "123abcÖ°Ö±Ö² 456DEFדהו 7890|%#" "+12rus" "×”" "דו" $R0 +\c ; $R0="123Ö°Ö±Ö²456×”7890" ;only Digits + Letters + ×” - דו \c SectionEnd \\Example (English + Russian Letters):\\ \c Section -\c ${StrFilter} "123abcÀÁ 456DEFãäå 7890|%#" "2rus" "" "" $R0 -\c ; $R0="ÀÁÂãäå" ;only Russian Letters -\c ${StrFilter} "123abcÀÁ 456DEFãäå 7890|%#" "2" "$R0" "" $R0 -\c ; $R0="abcÀÁÂDEFãäå" ;only English + Russian Letters +\c ${StrFilter} "123abcÖ°Ö±Ö² 456DEFדהו 7890|%#" "2rus" "" "" $R0 +\c ; $R0="ְֱֲדהו" ;only Russian Letters +\c ${StrFilter} "123abcÖ°Ö±Ö² 456DEFדהו 7890|%#" "2" "$R0" "" $R0 +\c ; $R0="abcÖ°Ö±Ö²DEFדהו" ;only English + Russian Letters \c SectionEnd \\Example (Word Capitalize):\\ diff --git a/Docs/src/history.but b/Docs/src/history.but index ceea797f..c696b0e1 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -1470,7 +1470,7 @@ Released on July 14th, 2007 \S1{v2.29-rl} Release Notes -\b The most notable addition in this release is nsDialogs - a faster and far more capable replacement for InstallOptions. It allows creating controls of any type directly from the script and removes the need to mess with slow INI files. It integrates directly into the script by calling functions for notification, including change notification for edit boxes. \W{http://nsis.sourceforge.net/Community}{Speak up} if you have any suggestions/comments/patches for it. +\b The most notable addition in this release is nsDialogs - a faster and far more capable replacement for InstallOptions. It allows creating controls of any type directly from the script and removes the need to mess with slow INI files. It integrates directly into the script by calling functions for notification, including change notification for edit boxes. \W{https://nsis.sourceforge.io/Community}{Speak up} if you have any suggestions/comments/patches for it. \S1{v2.29-cl} Changelog @@ -1818,7 +1818,7 @@ Released on November 27th, 2006 \S1{v2.22-rl} Release Notes -\b Some changes have been made to the credit and license files in order to avoid copyrights and license related confusions. This does not change in any way how NSIS should or could be used. NSIS itself is still licensed with the permissive BSD-like \W{http://nsis.sourceforge.net/License}{zlib license}. +\b Some changes have been made to the credit and license files in order to avoid copyrights and license related confusions. This does not change in any way how NSIS should or could be used. NSIS itself is still licensed with the permissive BSD-like \W{https://nsis.sourceforge.io/License}{zlib license}. \b Upgrade is recommended for early adopters of WinVer.nsh, due to a bug in Windows 98 and ME detection. @@ -2504,7 +2504,7 @@ Released on July 23rd, 2005 \S1{v2.08-rn} Release Notes -\b The Archive has been replaced with a \W{http://nsis.sourceforge.net/wiki/}{Wiki}. The new Wiki allows everyone to edit all pages so there's no longer need to hunt for the original author. It also allows everyone to upload plug-ins and not just administrators. And as if that's not enough, it looks better and provides easier and more feature-rich syntax. +\b The Archive has been replaced with a \W{https://nsis.sourceforge.io/wiki/}{Wiki}. The new Wiki allows everyone to edit all pages so there's no longer need to hunt for the original author. It also allows everyone to upload plug-ins and not just administrators. And as if that's not enough, it looks better and provides easier and more feature-rich syntax. \S1{v2.08-cl} Changelog @@ -2557,7 +2557,7 @@ Released on June 20th, 2005 \b Solid compression is no longer the default for bzip2 and lzma, use \c{SetCompressor /SOLID bzip2} or \c{SetCompressor /SOLID lzma} for solid compression. -\b Source code is no longer supplied with the installer package. Source code can be downloaded from CVS or from the \W{http://nsis.sourceforge.net/download/}{download page}. +\b Source code is no longer supplied with the installer package. Source code can be downloaded from CVS or from the \W{https://nsis.sourceforge.io/download/}{download page}. \b The directory structure of the installation has been changed. All documentation is now in the Docs folder and all examples are in the Examples folder. diff --git a/Docs/src/intro.but b/Docs/src/intro.but index 31a355eb..6b8e6d91 100644 --- a/Docs/src/intro.but +++ b/Docs/src/intro.but @@ -31,7 +31,7 @@ You can choose between three different integrated compression methods (ZLib, BZi \\Script based\\ -Unlike other systems that can only generate installers based on a list of files and registry keys, NSIS has a powerful scripting language. This script language is designed for installers and has commands that help you to perform many installation tasks. You can easily add custom logic and handle different upgrades, version checks and more. On the \W{http://nsis.sourceforge.net/wiki/}{NSIS Wiki} you can find a lot more. +Unlike other systems that can only generate installers based on a list of files and registry keys, NSIS has a powerful scripting language. This script language is designed for installers and has commands that help you to perform many installation tasks. You can easily add custom logic and handle different upgrades, version checks and more. On the \W{https://nsis.sourceforge.io/wiki/}{NSIS Wiki} you can find a lot more. \\Multiple languages in one installer\\ diff --git a/Docs/src/library.but b/Docs/src/library.but index 3c772bbb..7d664925 100644 --- a/Docs/src/library.but +++ b/Docs/src/library.but @@ -251,7 +251,7 @@ Location of the library \H{library_vb6} Visual Basic 6 Run-Time Files A new VB6RunTime.nsh header file is available for the setup of the VB6 run-time files. -To obtain the latest run-time files, download \W{http://nsis.sourceforge.net/vb6runtime.zip}{vb6runtime.zip} and extract this file. +To obtain the latest run-time files, download \W{https://nsis.sourceforge.io/vb6runtime.zip}{vb6runtime.zip} and extract this file. \c !include VB6RunTime.nsh \c diff --git a/Docs/src/tutorial.but b/Docs/src/tutorial.but index 63571efe..d84cafca 100644 --- a/Docs/src/tutorial.but +++ b/Docs/src/tutorial.but @@ -203,7 +203,7 @@ After calling the function, the variables contain the same value as before. Note \S2{tutdebug} Debugging Scripts -The more you work with NSIS the more complex the scripts will become. This will increase the potential of mistakes, especially when dealing with lots of variables. There are a few possibilities to help you debugging the code. To display the contents of variables you should use \R{messagebox}{MessageBoxes} or \R{detailprint}{DetailPrint}. To get a brief overview about all variables you should use the plug-in \W{http://nsis.sourceforge.net/DumpState}{DumpState}. By default all actions of the Installer are printed out in the Log Window. You can access the log if you right-click in the Log Window and select "Copy Details To Clipboard". There is also a way to write it directly to a file, see \R{dumplogtofile}{here}. +The more you work with NSIS the more complex the scripts will become. This will increase the potential of mistakes, especially when dealing with lots of variables. There are a few possibilities to help you debugging the code. To display the contents of variables you should use \R{messagebox}{MessageBoxes} or \R{detailprint}{DetailPrint}. To get a brief overview about all variables you should use the plug-in \W{https://nsis.sourceforge.io/DumpState}{DumpState}. By default all actions of the Installer are printed out in the Log Window. You can access the log if you right-click in the Log Window and select "Copy Details To Clipboard". There is also a way to write it directly to a file, see \R{dumplogtofile}{here}. \S1{tutscriptexecution} Script Execution diff --git a/Docs/src/usefulfunc.but b/Docs/src/usefulfunc.but index 582eb09f..e79fc8cc 100644 --- a/Docs/src/usefulfunc.but +++ b/Docs/src/usefulfunc.but @@ -43,7 +43,7 @@ \c ; NOTE: This is only able to detect .NET v1.x and v2.x! \c ; \c ; Based on GetDotNETVersion -\c ; http://nsis.sourceforge.net/Get_.NET_Version +\c ; https://nsis.sourceforge.io/Get_.NET_Version \c ; \c ; Usage: \c ; Call IsDotNETInstalled @@ -124,4 +124,4 @@ Put the following code in your \R{oninit}{.onInit function}: \H{morefuncs} More -You can find more useful scripts on \W{http://nsis.sourceforge.net/wiki/}{the NSIS Wiki}, \W{http://forums.winamp.com/forumdisplay.php?s=&forumid=65}{the NSIS forum} and the \W{http://nsis.sourceforge.net/}{NSIS development page}. \ No newline at end of file +You can find more useful scripts on \W{https://nsis.sourceforge.io/wiki/}{the NSIS Wiki}, \W{http://forums.winamp.com/forumdisplay.php?s=&forumid=65}{the NSIS forum} and the \W{https://nsis.sourceforge.io/}{NSIS development page}. \ No newline at end of file diff --git a/Docs/src/var.but b/Docs/src/var.but index fe160b8d..30e2cd54 100644 --- a/Docs/src/var.but +++ b/Docs/src/var.but @@ -1,6 +1,6 @@ \H{variables} Variables -All variables are global and can be used in Sections or Functions. Note that by default, variables are limited to 1024 characters. To extend this limit, \R{build}{build NSIS} with a bigger value of the NSIS_MAX_STRLEN build setting or use the \W{http://nsis.sourceforge.net/download/specialbuilds/}{special build}. +All variables are global and can be used in Sections or Functions. Note that by default, variables are limited to 1024 characters. To extend this limit, \R{build}{build NSIS} with a bigger value of the NSIS_MAX_STRLEN build setting or use the \W{https://nsis.sourceforge.io/download/specialbuilds/}{special build}. \S1{varuser} User Variables diff --git a/Examples/NSISMenu.nsi b/Examples/NSISMenu.nsi index 9f5011f8..ffa44302 100644 --- a/Examples/NSISMenu.nsi +++ b/Examples/NSISMenu.nsi @@ -240,7 +240,7 @@ nsDialogs::CreateControl ${__NSD_Label_CLASS} ${__NSD_Label_STYLE}|${SS_CENTERIM Pop $0 ${SetCtlColors} $0 ${CT_FOOTER} transparent transparent SendMessage $0 ${WM_SETFONT} ${HF_HEADER} 1 -nsDialogs::SetUserData $0 "http://nsis.sourceforge.net" +nsDialogs::SetUserData $0 "https://nsis.sourceforge.io" ${NSD_OnClick} $0 OnLinkClick nsDialogs::Show diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index 6b1d7997..851131ce 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -846,8 +846,8 @@ Section -post WriteRegDWORD HKLM "${REG_UNINST_KEY}" "VersionMinor" "${VER_MINOR}" ; Required by WACK !endif WriteRegStr HKLM "${REG_UNINST_KEY}" "Publisher" "Nullsoft and Contributors" ; Required by WACK - WriteRegStr HKLM "${REG_UNINST_KEY}" "URLInfoAbout" "http://nsis.sourceforge.net/" - WriteRegStr HKLM "${REG_UNINST_KEY}" "HelpLink" "http://nsis.sourceforge.net/Support" + WriteRegStr HKLM "${REG_UNINST_KEY}" "URLInfoAbout" "https://nsis.sourceforge.io/" + WriteRegStr HKLM "${REG_UNINST_KEY}" "HelpLink" "https://nsis.sourceforge.io/Support" WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoModify" "1" WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoRepair" "1" ${MakeARPInstallDate} $1 @@ -1034,7 +1034,7 @@ Function ShowReleaseNotes ${If} ${FileExists} $0 Exec '"$0" mk:@MSITStore:$INSTDIR\NSIS.chm::/SectionF.1.html' ${Else} - ExecShell "" "http://nsis.sourceforge.net/Docs/AppendixF.html#F.1" + ExecShell "" "https://nsis.sourceforge.io/Docs/AppendixF.html#F.1" ${EndIf} FunctionEnd diff --git a/Include/Sections.nsh b/Include/Sections.nsh index 633c4c72..add88090 100644 --- a/Include/Sections.nsh +++ b/Include/Sections.nsh @@ -148,7 +148,7 @@ ; ; Written by Robert Kehl ; -; For details, see http://nsis.sourceforge.net/wiki/SetSectionInInstType%2C_ClearSectionInInstType +; For details, see https://nsis.sourceforge.io/wiki/SetSectionInInstType%2C_ClearSectionInInstType ; ; Use the defines below for the WANTED_INSTTYPE parameter. diff --git a/Include/VB6RunTime.nsh b/Include/VB6RunTime.nsh index d6220e6d..b7da67fe 100644 --- a/Include/VB6RunTime.nsh +++ b/Include/VB6RunTime.nsh @@ -7,7 +7,7 @@ Setup of Visual Basic 6.0 run-time files, including the Oleaut32.dll security up Copyright 2008-2020 Joost Verburg To obtain the run-time files, download and extract -http://nsis.sourceforge.net/vb6runtime.zip +https://nsis.sourceforge.io/vb6runtime.zip Script code for installation: diff --git a/Menu/index.html b/Menu/index.html index 42d5ef6c..efa45e84 100644 --- a/Menu/index.html +++ b/Menu/index.html @@ -18,7 +18,7 @@

Developer Center
Many more examples, tutorials, plug-ins and NSIS-related software are available - at the on-line Developer Center. + at the on-line Developer Center.

@@ -32,7 +32,7 @@

On-line help
Forum
- FAQ
+ FAQ
Bug Tracker
@@ -58,7 +58,7 @@

- +
diff --git a/README.md b/README.md index 4784bf09..423479c6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,6 @@ NSIS (Nullsoft Scriptable Install System) is a professional open source system t ## External Links - * [Simple tutorial](http://nsis.sourceforge.net/Simple_tutorials) - * [NSIS Homepage](http://nsis.sourceforge.net/) - * [User Manual](http://nsis.sourceforge.net/Docs/) + * [Simple tutorial](https://nsis.sourceforge.io/Simple_tutorials) + * [NSIS Homepage](https://nsis.sourceforge.io/) + * [User Manual](https://nsis.sourceforge.io/Docs/) diff --git a/Scripts/release.py b/Scripts/release.py index 45c48fee..18cb6539 100644 --- a/Scripts/release.py +++ b/Scripts/release.py @@ -33,8 +33,8 @@ RSH="C:\Program Files\PuTTY\plink.exe" -2 -l kichik nsis.sourceforge.net SFTP="C:\Program Files\PuTTY\psftp.exe" -2 -l kichik,nsis -batch -b %s frs.sourceforge.net [wiki] -PURGE_URL=http://nsis.sourceforge.net/%s?action=purge -UPDATE_URL=http://nsis.sourceforge.net/Special:Simpleupdate?action=raw +PURGE_URL=https://nsis.sourceforge.io/%s?action=purge +UPDATE_URL=https://nsis.sourceforge.io/Special:Simpleupdate?action=raw [svn2cl] SVN2CL_XSL=svn2cl.xsl