From a048465f69a696538d6cd48c233f86bf7822a24a Mon Sep 17 00:00:00 2001 From: xzenor <15305998+xzenor@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:39:27 +0200 Subject: [PATCH 1/5] Create npp_x64.sls --- npp_x64.sls | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 npp_x64.sls diff --git a/npp_x64.sls b/npp_x64.sls new file mode 100644 index 000000000..d9a996155 --- /dev/null +++ b/npp_x64.sls @@ -0,0 +1,97 @@ +# just 64-bit installer. x64 was introduced at ver. 7.0. Most plugins are +# now also available for x64 but not all of them. Therefore there's still +# a seperate X64 sls for those who don't use the 32Bit. +npp_x64: + {% for version in ['8.3.3', + '8.3.2', + '8.3.1', + '8.3', + '8.2.1', + '8.2', + '8.1.9.3', + '8.1.9.2', + '8.1.9.1', + '8.1.9', + '8.1.8', + '8.1.7', + '8.1.6', + '8.1.5', + '8.1.4', + '8.1.3', + '8.1.2', + '8.1.1', + '8.1', + '8.0', + '7.9.5', + '7.9.4', + '7.9.3', + '7.9.2', + '7.9.1', + '7.9', + '7.8.9', + '7.8.8', + '7.8.7', + '7.8.6', + '7.8.5', + '7.8.4', + '7.8.3', + '7.8.2', + '7.8.1', + '7.8', + '7.7.1', + '7.7',] %} + '{{ version }}': + full_name: 'Notepad++ (64-bit x64)' + installer: 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v{{ version }}/npp.{{ version }}.Installer.x64.exe' + install_flags: '/S' + uninstaller: '%ProgramFiles%\Notepad++\uninstall.exe' + uninstall_flags: '/S' + msiexec: False + locale: en_US + reboot: False + {% endfor %} + +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# Below are versions of Notepad Plus Plus that have had the installer assets +# removed from github. An uninstall only definition will remain here so the +# packages will show up correctly in `pkg.list_pkgs` and to allow for removal +# using `pkg.remove` +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + {% for version in ['7.6.6', + '7.6.5', + '7.6.4', + '7.6.3', + '7.6.2', + '7.6.1', + '7.6', + '7.5.9', + '7.5.8', + '7.5.7', + '7.5.6', + '7.5.5', + '7.5.4', + '7.5.3', + '7.5.2', + '7.5.1', + '7.5', + '7.4.2', + '7.4.1', + '7.4', + '7.3.3', + '7.3.2', + '7.3.1', + '7.3', + '7.2.2', + '7.2.1', + '7.2', + '7.1', + '7'] %} + '{{ version }}': + skip_urltest: True + full_name: 'Notepad++ (64-bit x64)' + uninstaller: '%ProgramFiles%\Notepad++\uninstall.exe' + uninstall_flags: '/S' + msiexec: False + locale: en_US + reboot: False + {% endfor %} From 7c3b71b3241409e1d4977e7d9c77671a6c9e7b57 Mon Sep 17 00:00:00 2001 From: xzenor <15305998+xzenor@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:41:23 +0200 Subject: [PATCH 2/5] Update npp_x64.sls --- npp_x64.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npp_x64.sls b/npp_x64.sls index d9a996155..9971136dd 100644 --- a/npp_x64.sls +++ b/npp_x64.sls @@ -1,6 +1,6 @@ # just 64-bit installer. x64 was introduced at ver. 7.0. Most plugins are -# now also available for x64 but not all of them. Therefore there's still -# a seperate X64 sls for those who don't use the 32Bit. +# now also available for x64 but not all of them. Therefore there's now +# a seperate x64 sls for those who want to use the x64 version. npp_x64: {% for version in ['8.3.3', '8.3.2', From fde6d91af9810d0aa03e7178be9f0abdf2cb823b Mon Sep 17 00:00:00 2001 From: xzenor <15305998+xzenor@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:57:27 +0200 Subject: [PATCH 3/5] Update npp_x64.sls Fixed 404 download url's. --- npp_x64.sls | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/npp_x64.sls b/npp_x64.sls index 9971136dd..01e7be8c1 100644 --- a/npp_x64.sls +++ b/npp_x64.sls @@ -3,25 +3,17 @@ # a seperate x64 sls for those who want to use the x64 version. npp_x64: {% for version in ['8.3.3', - '8.3.2', '8.3.1', - '8.3', '8.2.1', '8.2', '8.1.9.3', '8.1.9.2', - '8.1.9.1', - '8.1.9', - '8.1.8', - '8.1.7', - '8.1.6', '8.1.5', '8.1.4', '8.1.3', '8.1.2', '8.1.1', '8.1', - '8.0', '7.9.5', '7.9.4', '7.9.3', @@ -57,7 +49,15 @@ npp_x64: # packages will show up correctly in `pkg.list_pkgs` and to allow for removal # using `pkg.remove` # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - {% for version in ['7.6.6', + {% for version in ['8.3.2', + '8.3', + '8.1.9.1', + '8.1.9', + '8.1.8', + '8.1.7', + '8.1.6', + '8.0', + '7.6.6', '7.6.5', '7.6.4', '7.6.3', From 4d73eff98dc37283c81b9079aab5af92eb02cdcf Mon Sep 17 00:00:00 2001 From: Twangboy Date: Wed, 6 Apr 2022 15:10:12 -0600 Subject: [PATCH 4/5] Fix indenting --- npp_x64.sls | 138 +++++++++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 67 deletions(-) diff --git a/npp_x64.sls b/npp_x64.sls index 01e7be8c1..93f66ff09 100644 --- a/npp_x64.sls +++ b/npp_x64.sls @@ -2,36 +2,38 @@ # now also available for x64 but not all of them. Therefore there's now # a seperate x64 sls for those who want to use the x64 version. npp_x64: - {% for version in ['8.3.3', - '8.3.1', - '8.2.1', - '8.2', - '8.1.9.3', - '8.1.9.2', - '8.1.5', - '8.1.4', - '8.1.3', - '8.1.2', - '8.1.1', - '8.1', - '7.9.5', - '7.9.4', - '7.9.3', - '7.9.2', - '7.9.1', - '7.9', - '7.8.9', - '7.8.8', - '7.8.7', - '7.8.6', - '7.8.5', - '7.8.4', - '7.8.3', - '7.8.2', - '7.8.1', - '7.8', - '7.7.1', - '7.7',] %} + {% for version in [ + '8.3.3', + '8.3.1', + '8.2.1', + '8.2', + '8.1.9.3', + '8.1.9.2', + '8.1.5', + '8.1.4', + '8.1.3', + '8.1.2', + '8.1.1', + '8.1', + '7.9.5', + '7.9.4', + '7.9.3', + '7.9.2', + '7.9.1', + '7.9', + '7.8.9', + '7.8.8', + '7.8.7', + '7.8.6', + '7.8.5', + '7.8.4', + '7.8.3', + '7.8.2', + '7.8.1', + '7.8', + '7.7.1', + '7.7', + ]%} '{{ version }}': full_name: 'Notepad++ (64-bit x64)' installer: 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v{{ version }}/npp.{{ version }}.Installer.x64.exe' @@ -49,43 +51,45 @@ npp_x64: # packages will show up correctly in `pkg.list_pkgs` and to allow for removal # using `pkg.remove` # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - {% for version in ['8.3.2', - '8.3', - '8.1.9.1', - '8.1.9', - '8.1.8', - '8.1.7', - '8.1.6', - '8.0', - '7.6.6', - '7.6.5', - '7.6.4', - '7.6.3', - '7.6.2', - '7.6.1', - '7.6', - '7.5.9', - '7.5.8', - '7.5.7', - '7.5.6', - '7.5.5', - '7.5.4', - '7.5.3', - '7.5.2', - '7.5.1', - '7.5', - '7.4.2', - '7.4.1', - '7.4', - '7.3.3', - '7.3.2', - '7.3.1', - '7.3', - '7.2.2', - '7.2.1', - '7.2', - '7.1', - '7'] %} + {% for version in [ + '8.3.2', + '8.3', + '8.1.9.1', + '8.1.9', + '8.1.8', + '8.1.7', + '8.1.6', + '8.0', + '7.6.6', + '7.6.5', + '7.6.4', + '7.6.3', + '7.6.2', + '7.6.1', + '7.6', + '7.5.9', + '7.5.8', + '7.5.7', + '7.5.6', + '7.5.5', + '7.5.4', + '7.5.3', + '7.5.2', + '7.5.1', + '7.5', + '7.4.2', + '7.4.1', + '7.4', + '7.3.3', + '7.3.2', + '7.3.1', + '7.3', + '7.2.2', + '7.2.1', + '7.2', + '7.1', + '7', + ] %} '{{ version }}': skip_urltest: True full_name: 'Notepad++ (64-bit x64)' From 912a225c01f1591f74b84c3ad30195c5c8f92ff0 Mon Sep 17 00:00:00 2001 From: Twangboy Date: Wed, 6 Apr 2022 15:18:52 -0600 Subject: [PATCH 5/5] Only allow install on x64 machines --- npp_x64.sls | 152 +++++++++++++++++++++++++++------------------------- 1 file changed, 79 insertions(+), 73 deletions(-) diff --git a/npp_x64.sls b/npp_x64.sls index 93f66ff09..5da1ee8bb 100644 --- a/npp_x64.sls +++ b/npp_x64.sls @@ -1,39 +1,42 @@ # just 64-bit installer. x64 was introduced at ver. 7.0. Most plugins are # now also available for x64 but not all of them. Therefore there's now # a seperate x64 sls for those who want to use the x64 version. +{% if grains['cpuarch'] == 'AMD64' %} npp_x64: - {% for version in [ - '8.3.3', - '8.3.1', - '8.2.1', - '8.2', - '8.1.9.3', - '8.1.9.2', - '8.1.5', - '8.1.4', - '8.1.3', - '8.1.2', - '8.1.1', - '8.1', - '7.9.5', - '7.9.4', - '7.9.3', - '7.9.2', - '7.9.1', - '7.9', - '7.8.9', - '7.8.8', - '7.8.7', - '7.8.6', - '7.8.5', - '7.8.4', - '7.8.3', - '7.8.2', - '7.8.1', - '7.8', - '7.7.1', - '7.7', - ]%} +{% + for version in [ + '8.3.3', + '8.3.1', + '8.2.1', + '8.2', + '8.1.9.3', + '8.1.9.2', + '8.1.5', + '8.1.4', + '8.1.3', + '8.1.2', + '8.1.1', + '8.1', + '7.9.5', + '7.9.4', + '7.9.3', + '7.9.2', + '7.9.1', + '7.9', + '7.8.9', + '7.8.8', + '7.8.7', + '7.8.6', + '7.8.5', + '7.8.4', + '7.8.3', + '7.8.2', + '7.8.1', + '7.8', + '7.7.1', + '7.7', + ] +%} '{{ version }}': full_name: 'Notepad++ (64-bit x64)' installer: 'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v{{ version }}/npp.{{ version }}.Installer.x64.exe' @@ -43,7 +46,7 @@ npp_x64: msiexec: False locale: en_US reboot: False - {% endfor %} +{% endfor %} # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Below are versions of Notepad Plus Plus that have had the installer assets @@ -51,45 +54,47 @@ npp_x64: # packages will show up correctly in `pkg.list_pkgs` and to allow for removal # using `pkg.remove` # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - {% for version in [ - '8.3.2', - '8.3', - '8.1.9.1', - '8.1.9', - '8.1.8', - '8.1.7', - '8.1.6', - '8.0', - '7.6.6', - '7.6.5', - '7.6.4', - '7.6.3', - '7.6.2', - '7.6.1', - '7.6', - '7.5.9', - '7.5.8', - '7.5.7', - '7.5.6', - '7.5.5', - '7.5.4', - '7.5.3', - '7.5.2', - '7.5.1', - '7.5', - '7.4.2', - '7.4.1', - '7.4', - '7.3.3', - '7.3.2', - '7.3.1', - '7.3', - '7.2.2', - '7.2.1', - '7.2', - '7.1', - '7', - ] %} +{% + for version in [ + '8.3.2', + '8.3', + '8.1.9.1', + '8.1.9', + '8.1.8', + '8.1.7', + '8.1.6', + '8.0', + '7.6.6', + '7.6.5', + '7.6.4', + '7.6.3', + '7.6.2', + '7.6.1', + '7.6', + '7.5.9', + '7.5.8', + '7.5.7', + '7.5.6', + '7.5.5', + '7.5.4', + '7.5.3', + '7.5.2', + '7.5.1', + '7.5', + '7.4.2', + '7.4.1', + '7.4', + '7.3.3', + '7.3.2', + '7.3.1', + '7.3', + '7.2.2', + '7.2.1', + '7.2', + '7.1', + '7', + ] +%} '{{ version }}': skip_urltest: True full_name: 'Notepad++ (64-bit x64)' @@ -98,4 +103,5 @@ npp_x64: msiexec: False locale: en_US reboot: False - {% endfor %} +{% endfor %} +{% endif %}