Merge pull request #9 from PhoenicisOrg/master

Merge master

.eslintignore

@@ -0,0 +1 @@
+/docs/

.eslintrc.yml

@@ -47,7 +47,9 @@ globals:
   CabExtract: false
   Checksum: false
   Downloader: false
+  Engine: false
   Extractor: false
+  InstallationType: false
   Resource: false
   SetupWizard: false
   Wine: false

.travis.yml

@@ -5,6 +5,15 @@ branches:
 
 matrix:
   include:
+    - stage: Check JSON format
+      before_install: npm install -g json-align
+      script:
+        - find . -name "*.json" -print0 | xargs -0 json-align -i
+        - diffs=$(git diff --name-only | wc -l); if [ $diffs != 0 ]; then exit 1; fi
+      after_failure:
+        - echo "Some JSON files are not aligned. Please run json-align."
+        - git diff --name-only
+
     - stage: Update translations
       before_install:
         - sudo apt-get -qq update
@@ -26,7 +35,7 @@ matrix:
       os: linux
       language: ruby
       rvm:
-        - 2.1
+        - 2.5
       before_install: cd docs
       script:
         - bundle exec jekyll build

Applications/Accessories/7-zip/Online/script.js

@@ -1,12 +1,19 @@
 include(["engines", "wine", "quick_script", "online_installer_script"]);
 
-new OnlineInstallerScript()
-    .name("7-zip")
-    .editor("Igor Pavlov")
-    .applicationHomepage("http://www.7-zip.org/")
-    .author("ImperatorS79")
-    .url("https://www.7-zip.org/a/7z1801.exe")
-    .checksum("d56bca4973b1d1aa5915c41dce318b077ce8b5b2")
-    .category("Accessories")
-    .executable("7zFM.exe")
-    .go();
+var installerImplementation = {
+    run: function () {
+        new OnlineInstallerScript()
+            .name("7-zip")
+            .editor("Igor Pavlov")
+            .applicationHomepage("http://www.7-zip.org/")
+            .author("ImperatorS79")
+            .url("https://www.7-zip.org/a/7z1801.exe")
+            .checksum("d56bca4973b1d1aa5915c41dce318b077ce8b5b2")
+            .category("Accessories")
+            .executable("7zFM.exe")
+            .go();
+    }
+};
+
+/* exported Installer */
+var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation);

Applications/Accessories/7-zip/Online/script.json

@@ -1,8 +1,11 @@
 {
-	"scriptName": "Online",
-	"id": "online",
-	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
-	"testingOperatingSystems": [],
-	"free": true,
-	"requiresPatch": false
-} 
+    "scriptName"                 : "Online",
+    "id"                         : "online",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
+}

Applications/Accessories/7-zip/application.json

@@ -1,5 +1,5 @@
 {
-	"name":	"7-zip",
-	"id":	"7zip",
-	"description": "7-Zip is a file archiver with a high compression ratio. 7-Zip is open source software. Most of the source code is under the GNU LGPL license. The unRAR code is under a mixed license: GNU LGPL + unRAR restrictions. You can use 7-Zip on any computer, including a computer in a commercial organization. You don't need to register or pay for 7-Zip."
+    "name"        : "7-zip",
+    "id"          : "7zip",
+    "description" : "7-Zip is a file archiver with a high compression ratio. 7-Zip is open source software. Most of the source code is under the GNU LGPL license. The unRAR code is under a mixed license: GNU LGPL + unRAR restrictions. You can use 7-Zip on any computer, including a computer in a commercial organization. You don't need to register or pay for 7-Zip."
 }

Applications/Accessories/ImgBurn/Online/script.js

@@ -1,12 +1,19 @@
 include(["engines", "wine", "quick_script", "online_installer_script"]);
 
-new OnlineInstallerScript()
-    .name("ImgBurn")
-    .editor("Lightning UK!")
-    .applicationHomepage("http://www.imgburn.com/")
-    .author("ImperatorS79")
-    .url("http://download.imgburn.com/SetupImgBurn_2.5.8.0.exe")
-    .checksum("6fc013ed5944b13efc54648699ea80f304e37ad0")
-    .category("Accessories")
-    .executable("ImgBurn.exe")
-    .go();
+var installerImplementation = {
+    run: function () {
+        new OnlineInstallerScript()
+            .name("ImgBurn")
+            .editor("Lightning UK!")
+            .applicationHomepage("http://www.imgburn.com/")
+            .author("ImperatorS79")
+            .url("http://download.imgburn.com/SetupImgBurn_2.5.8.0.exe")
+            .checksum("6fc013ed5944b13efc54648699ea80f304e37ad0")
+            .category("Accessories")
+            .executable("ImgBurn.exe")
+            .go();
+    }
+};
+
+/* exported Installer */
+var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation);

Applications/Accessories/ImgBurn/Online/script.json

@@ -1,8 +1,11 @@
 {
-	"scriptName": "Online",
-	"id": "online",
-	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
-	"testingOperatingSystems": [],
-	"free": true,
-	"requiresPatch": false
+    "scriptName"                 : "Online",
+    "id"                         : "online",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
 }

Applications/Accessories/ImgBurn/application.json

@@ -1,5 +1,5 @@
 {
-	"name":	"ImgBurn",
-	"id":	"img_burn",
-	"description": "ImgBurn is a lightweight CD / DVD / HD DVD / Blu-ray burning application."
-} 
+    "name"        : "ImgBurn",
+    "id"          : "img_burn",
+    "description" : "ImgBurn is a lightweight CD / DVD / HD DVD / Blu-ray burning application."
+}

Applications/Accessories/Soundplant/Online/script.js

@@ -1,15 +1,23 @@
 include(["engines", "wine", "quick_script", "online_installer_script"]);
+include(["engines", "wine", "plugins", "windows_version"]);
 
-new OnlineInstallerScript()
-    .name("Soundplant")
-    .editor("Marcel Blum")
-    .applicationHomepage("http://soundplant.org/")
-    .author("ImperatorS79")
-    .url("http://soundplant.org/downloads/Soundplant45_Win_setup.exe")
-    .checksum("df17f942189618219cd504beee1be0712f4e4e4e")
-    .category("Accessories")
-    .executable("Soundplant45.exe")
-    .preInstall(function (wine/*, wizard*/) {
-        wine.windowsVersion("win7");
-    })
-    .go();
+var installerImplementation = {
+    run: function () {
+        new OnlineInstallerScript()
+            .name("Soundplant")
+            .editor("Marcel Blum")
+            .applicationHomepage("http://soundplant.org/")
+            .author("ImperatorS79")
+            .url("http://soundplant.org/downloads/Soundplant45_Win_setup.exe")
+            .checksum("df17f942189618219cd504beee1be0712f4e4e4e")
+            .category("Accessories")
+            .executable("Soundplant45.exe")
+            .preInstall(function (wine/*, wizard*/) {
+                wine.windowsVersion("win7");
+            })
+            .go();
+    }
+};
+
+/* exported Installer */
+var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation);

Applications/Accessories/Soundplant/Online/script.json

@@ -1,9 +1,11 @@
 {
-	"scriptName": "Online",
-	"id": "online",
-	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
-	"testingOperatingSystems": [],
-	"free": true,
-	"requiresPatch": false
-} 
-
+    "scriptName"                 : "Online",
+    "id"                         : "online",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
+}

Applications/Accessories/Soundplant/application.json

@@ -1,5 +1,5 @@
 {
-	"name":	"Soundplant",
-	"id":	"soundplant",
-	"description": "Soundplant turns your computer keyboard into a versatile, low latency sound trigger and playable instrument.<br><br>Via drag & drop, easily assign sound files of any format and length onto 72 keyboard keys, creating custom soundboards that put hours of instantly-playing audio at your fingertips with no extra hardware needed.<br><br>Soundplant is used for live music and sound effects, as a drum pad, as a unique electronic instrument, as an educational aid, and just for fun - in radio, television, theater, podcasting, presentations, studios, stadiums, classrooms, clubs, museums, and churches - by DJs, musicians, engineers, sound designers, composers, artists, teachers, magicians, puppeteers, comedians, public speakers, gamers, and more.<br><br> N.B.: Free version has some features unavailable, see http://soundplant.org/support.htm/"
+    "name"        : "Soundplant",
+    "id"          : "soundplant",
+    "description" : "Soundplant turns your computer keyboard into a versatile, low latency sound trigger and playable instrument.<br><br>Via drag & drop, easily assign sound files of any format and length onto 72 keyboard keys, creating custom soundboards that put hours of instantly-playing audio at your fingertips with no extra hardware needed.<br><br>Soundplant is used for live music and sound effects, as a drum pad, as a unique electronic instrument, as an educational aid, and just for fun - in radio, television, theater, podcasting, presentations, studios, stadiums, classrooms, clubs, museums, and churches - by DJs, musicians, engineers, sound designers, composers, artists, teachers, magicians, puppeteers, comedians, public speakers, gamers, and more.<br><br> N.B.: Free version has some features unavailable, see http://soundplant.org/support.htm/"
 }

Applications/Accessories/category.json

@@ -1,5 +1,5 @@
 {
-	"name": "Accessories",
-	"id": "accessories",
-	"type": "INSTALLERS"
+    "name" : "Accessories",
+    "id"   : "accessories",
+    "type" : "INSTALLERS"
 }

Applications/Custom/LocalInstaller/Local/script.js

@@ -1,15 +1,23 @@
 include(["engines", "wine", "quick_script", "local_installer_script"]);
+include(["engines", "wine", "plugins", "windows_version"]);
 
-new LocalInstallerScript()
-    .editor("PlayOnLinux")
-    .applicationHomepage("https://www.playonlinux.com/en/")
-    .author("Plata")
-    .category("Custom")
-    .wineUserSettings(true)
-    .preInstall(function (wine, wizard) {
-        var versions = ["win7", "vista", "win2003", "winxp", "win2k", "winnt", "winme", "win98", "win95", "win31"];
-        var shownVersions = ["win7", "vista", "win2003", "winxp (recommended)", "win2k", "winnt", "winme", "win98", "win95", "win31"];
-        var selectedVersion = wizard.menu("Please select the wine windows version.", shownVersions, "winxp (recommended)");
-        wine.windowsVersion(versions[selectedVersion.index]);
-    })
-    .go();
+var installerImplementation = {
+    run: function () {
+        new LocalInstallerScript()
+            .editor("PlayOnLinux")
+            .applicationHomepage("https://www.playonlinux.com/en/")
+            .author("Plata")
+            .category("Custom")
+            .wineUserSettings(true)
+            .preInstall(function (wine, wizard) {
+                var versions = ["win7", "vista", "win2003", "winxp", "win2k", "winnt", "winme", "win98", "win95", "win31"];
+                var shownVersions = ["win7", "vista", "win2003", "winxp (recommended)", "win2k", "winnt", "winme", "win98", "win95", "win31"];
+                var selectedVersion = wizard.menu("Please select the wine windows version.", shownVersions, "winxp (recommended)");
+                wine.windowsVersion(versions[selectedVersion.index]);
+            })
+            .go();
+    }
+};
+
+/* exported Installer */
+var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation);

Applications/Custom/LocalInstaller/Local/script.json

@@ -1,8 +1,11 @@
 {
-	"scriptName": "Local",
-	"id": "local",
-	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
-	"testingOperatingSystems": [],
-	"free": true,
-	"requiresPatch": false
+    "scriptName"                 : "Local",
+    "id"                         : "local",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
 }

Applications/Custom/LocalInstaller/application.json

@@ -1,5 +1,5 @@
 {
-	"name": "Local Installer",
-	"id": "local_installer",
-	"description": "The Local Installer allows you to install custom applications from your local computer."
+    "name"        : "Local Installer",
+    "id"          : "local_installer",
+    "description" : "The Local Installer allows you to install custom applications from your local computer."
 }

Applications/Custom/OnlineInstaller/Online/script.js

@@ -1,15 +1,23 @@
 include(["engines", "wine", "quick_script", "online_installer_script"]);
+include(["engines", "wine", "plugins", "windows_version"]);
 
-new OnlineInstallerScript()
-    .editor("PlayOnLinux")
-    .applicationHomepage("https://www.playonlinux.com/en/")
-    .author("Plata")
-    .category("Custom")
-    .wineUserSettings(true)
-    .preInstall(function (wine, wizard) {
-        var versions = ["win7", "vista", "win2003", "winxp", "win2k", "winnt", "winme", "win98", "win95", "win31"];
-        var shownVersions = ["win7", "vista", "win2003", "winxp (recommended)", "win2k", "winnt", "winme", "win98", "win95", "win31"];
-        var selectedVersion = wizard.menu("Please select the wine windows version.", shownVersions, "winxp (recommended)");
-        wine.windowsVersion(versions[selectedVersion.index]);
-    })
-    .go();
+var installerImplementation = {
+    run: function () {
+        new OnlineInstallerScript()
+            .editor("PlayOnLinux")
+            .applicationHomepage("https://www.playonlinux.com/en/")
+            .author("Plata")
+            .category("Custom")
+            .wineUserSettings(true)
+            .preInstall(function (wine, wizard) {
+                var versions = ["win7", "vista", "win2003", "winxp", "win2k", "winnt", "winme", "win98", "win95", "win31"];
+                var shownVersions = ["win7", "vista", "win2003", "winxp (recommended)", "win2k", "winnt", "winme", "win98", "win95", "win31"];
+                var selectedVersion = wizard.menu("Please select the wine windows version.", shownVersions, "winxp (recommended)");
+                wine.windowsVersion(versions[selectedVersion.index]);
+            })
+            .go();
+    }
+};
+
+/* exported Installer */
+var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation);

Applications/Custom/OnlineInstaller/Online/script.json

@@ -1,8 +1,11 @@
 {
-	"scriptName": "Online",
-	"id": "online",
-	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
-	"testingOperatingSystems": [],
-	"free": true,
-	"requiresPatch": false
+    "scriptName"                 : "Online",
+    "id"                         : "online",
+    "compatibleOperatingSystems" : [
+        "MACOSX",
+        "LINUX"
+    ],
+    "testingOperatingSystems" : [],
+    "free"                    : true,
+    "requiresPatch"           : false
 }

Applications/Custom/OnlineInstaller/application.json

@@ -1,5 +1,5 @@
 {
-	"name": "Online Installer",
-	"id": "online_installer",
-	"description": "The Online Installer allows you to install custom applications from the Internet."
+    "name"        : "Online Installer",
+    "id"          : "online_installer",
+    "description" : "The Online Installer allows you to install custom applications from the Internet."
 }

Applications/Custom/category.json

@@ -1,5 +1,5 @@
 {
-	"name": "Custom",
-	"id": "custom",
-	"type": "INSTALLERS"
+    "name" : "Custom",
+    "id"   : "custom",
+    "type" : "INSTALLERS"
 }

Applications/Development/Notepad++/application.json

@@ -1,5 +1,5 @@
 {
-	"name": "Notepad++",
-	"id": "notepad_plus_plus",
-	"description": "Notepad++ is a free (as in &quot;free speech&quot; and also as in &quot;free beer&quot;) source code editor and Notepad replacement that supports several languages. Running in the MS Windows environment, its use is governed by GPL License.<br><br>Based on a powerful editing component Scintilla, Notepad++ is written in C++ and uses pure Win32 API and STL which ensures a higher execution speed and smaller program size. By optimizing as many routines as possible without losing user friendliness, Notepad++ is trying to reduce the world carbon dioxide emissions. When using less CPU power, the PC can throttle down and reduce power consumption, resulting in a greener environment.<br><br>Source: http://notepad-plus.sourceforge.net/uk/site.htm"
+    "name"        : "Notepad++",
+    "id"          : "notepad_plus_plus",
+    "description" : "Notepad++ is a free (as in &quot;free speech&quot; and also as in &quot;free beer&quot;) source code editor and Notepad replacement that supports several languages. Running in the MS Windows environment, its use is governed by GPL License.<br><br>Based on a powerful editing component Scintilla, Notepad++ is written in C++ and uses pure Win32 API and STL which ensures a higher execution speed and smaller program size. By optimizing as many routines as possible without losing user friendliness, Notepad++ is trying to reduce the world carbon dioxide emissions. When using less CPU power, the PC can throttle down and reduce power consumption, resulting in a greener environment.<br><br>Source: http://notepad-plus.sourceforge.net/uk/site.htm"
 }