Merge pull request #8 from PhoenicisOrg/master

Merge master

.eslintrc.yml

@@ -1,21 +1,68 @@
+---
+extends:
+  - eslint:recommended
+
+env:
+  nashorn: true
+
 rules:
-  indent: 4
-
+  valid-jsdoc: 2
+  comma-spacing:
+    - 2
+    - {before: false, after: true}
+  keyword-spacing:
+    - 2
+    - {before: true, after: true}
+  space-before-function-paren:
+    - 2
+    - {anonymous: always, named: never, asyncArrow: always}
+  no-trailing-spaces: 2
+  indent:
+    - 2
+    - 4
+    - {SwitchCase: 1, ArrayExpression: first}
+
 globals:
-  include: true
+  include: false
+  TYPE_ID: false
+  CATEGORY_ID: false
+  APPLICATION_ID: false
+  # java
+  Bean: false
   # files
-  mkdir: true
-  fileExists: true
-  cat: true
-  cp: true
-  getFileSize: true
-  fileName: true
-  lns: true
-  remove: true
-  touch: true
-  writeToFile: true
-  createTempFile: true
+  mkdir: false
+  fileExists: false
+  cat: false
+  cp: false
+  getFileSize: false
+  fileName: false
+  lns: false
+  remove: false
+  touch: false
+  tr: false
+  writeToFile: false
+  createTempFile: false
+  # classes
+  AppResource: false
+  CabExtract: false
+  Checksum: false
+  Downloader: false
+  Extractor: false
+  Resource: false
+  SetupWizard: false
+  Wine: false
+  WineShortcut: false
+  # quick scripts
+  CustomInstallerScript: false
+  InstallerScript: false
+  LocalInstallerScript: false
+  OnlineInstallerScript: false
+  QuickScript: false
+  SteamScript: false
+  UplayScript: false
+  ZipScript: false
   # wine
-  LATEST_DEVELOPMENT_VERSION: true
-  LATEST_STABLE_VERSION: true
-  LATEST_STAGING_VERSION: true
+  LATEST_DEVELOPMENT_VERSION: false
+  LATEST_STABLE_VERSION: false
+  LATEST_STAGING_VERSION: false
+  WINE_PREFIX_DIR: false

.gitignore

@@ -0,0 +1 @@
+/.idea/

.travis.yml

@@ -1,13 +1,36 @@
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y python-jsonschema python-pil gettext
+# avoid double builds on pull requests
+branches:
+  only:
+    master
 
-script:
-  - python ./validate.py
+matrix:
+  include:
+    - stage: Update translations
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install -y python-jsonschema python-pil gettext
+      script:
+        - python ./validate.py
+      after_success:
+        # push translation updates only for master (PR changes must be committed to master before they are taken into account)
+        - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./i18n/push_translations.sh; fi
 
-after_success:
-  # push translation updates only for master (PR changes must be committed to master before they are taken into account)
-  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./i18n/push_translations.sh; fi
+    # Update JSDoc
+    - stage: Update JSDoc
+      script:
+        # push JSDoc updates only for master (PR changes must be committed to master before they are taken into account)
+        - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./push_jsdoc.sh; fi
+
+    # Check GitHub Pages
+    - stage: Check GitHub Pages
+      os: linux
+      language: ruby
+      rvm:
+        - 2.1
+      before_install: cd docs
+      script:
+        - bundle exec jekyll build
+        - bundle exec htmlproofer ./_site --only-4xx --check-favicon --check-html --assume-extension --file-ignore=/jsdoc/
 
 env:
   global:

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

@@ -1,12 +1,12 @@
-include(["Engines", "Wine", "QuickScript", "OnlineInstallerScript"]);
+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("http://www.7-zip.org/a/7z1604.exe")                       
-    .checksum("dd1cb1163c5572951c9cd27f5a8dd550b33c58a4")                       
-    .category("Accessories")                           
-    .executable("7zFM.exe")                  
-    .go(); 
+    .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();

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

@@ -1,5 +1,6 @@
 {
 	"scriptName": "Online",
+	"id": "online",
 	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
 	"testingOperatingSystems": [],
 	"free": true,

Applications/Accessories/7-zip/application.json

@@ -1,4 +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."
 }

Applications/Accessories/ImgBurn/Online/script.js

@@ -1,12 +1,12 @@
- include(["Engines", "Wine", "QuickScript", "OnlineInstallerScript"]);
+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(); 
+    .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();

Applications/Accessories/ImgBurn/Online/script.json

@@ -1,5 +1,6 @@
 {
 	"scriptName": "Online",
+	"id": "online",
 	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
 	"testingOperatingSystems": [],
 	"free": true,

Applications/Accessories/ImgBurn/application.json

@@ -1,4 +1,5 @@
 {
 	"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,15 @@
-include(["Engines", "Wine", "QuickScript", "OnlineInstallerScript"]);
+include(["engines", "wine", "quick_script", "online_installer_script"]);
 
 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")                           
+    .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) {
+    .preInstall(function (wine/*, wizard*/) {
         wine.windowsVersion("win7");
     })
-    .go(); 
+    .go();

Applications/Accessories/Soundplant/Online/script.json

@@ -1,5 +1,6 @@
 {
 	"scriptName": "Online",
+	"id": "online",
 	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
 	"testingOperatingSystems": [],
 	"free": true,

Applications/Accessories/Soundplant/application.json

@@ -1,4 +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/"
 }

Applications/Accessories/category.json

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

Applications/Custom/LocalInstaller/Local/script.js

@@ -1,12 +1,12 @@
-include(["Engines", "Wine", "QuickScript", "LocalInstallerScript"]);
+include(["engines", "wine", "quick_script", "local_installer_script"]);
 
 new LocalInstallerScript()
     .editor("PlayOnLinux")
     .applicationHomepage("https://www.playonlinux.com/en/")
     .author("Plata")
     .category("Custom")
     .wineUserSettings(true)
-    .preInstall(function(wine, wizard) {
+    .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)");

Applications/Custom/LocalInstaller/Local/script.json

@@ -1,5 +1,6 @@
 {
 	"scriptName": "Local",
+	"id": "local",
 	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
 	"testingOperatingSystems": [],
 	"free": true,

Applications/Custom/LocalInstaller/application.json

@@ -1,4 +1,5 @@
 {
 	"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,12 +1,12 @@
-include(["Engines", "Wine", "QuickScript", "OnlineInstallerScript"]);
+include(["engines", "wine", "quick_script", "online_installer_script"]);
 
 new OnlineInstallerScript()
     .editor("PlayOnLinux")
     .applicationHomepage("https://www.playonlinux.com/en/")
     .author("Plata")
     .category("Custom")
     .wineUserSettings(true)
-    .preInstall(function(wine, wizard) {
+    .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)");

Applications/Custom/OnlineInstaller/Online/script.json

@@ -1,5 +1,6 @@
 {
 	"scriptName": "Online",
+	"id": "online",
 	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
 	"testingOperatingSystems": [],
 	"free": true,

Applications/Custom/OnlineInstaller/application.json

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

Applications/Custom/category.json

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

Applications/Development/Notepad++/application.json

@@ -1,4 +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"
 }

Applications/Development/Notepad++/v7.2.2/script.js

@@ -1,4 +1,4 @@
-include(["Engines", "Wine", "QuickScript", "OnlineInstallerScript"]);
+include(["engines", "wine", "quick_script", "online_installer_script"]);
 
 new OnlineInstallerScript()
     .name("Notepad++")

Applications/Development/Notepad++/v7.2.2/script.json

@@ -1,5 +1,6 @@
 {
 	"scriptName": "v.7.2.2",
+	"id": "v_7_2_2",
 	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
 	"testingOperatingSystems": [],
 	"free": true,

Applications/Development/category.json

@@ -1,4 +1,5 @@
 {
 	"name": "Development",
+	"id": "development",
 	"type": "INSTALLERS"
 }

Applications/Games/18 Wheels of Steel Across America/Local/script.js

@@ -1,4 +1,4 @@
-include(["Engines", "Wine", "QuickScript", "LocalInstallerScript"]);
+include(["engines", "wine", "quick_script", "local_installer_script"]);
 
 new LocalInstallerScript()
     .name("18 Wheels of Steel: Across America")

Applications/Games/18 Wheels of Steel Across America/Local/script.json

@@ -1,5 +1,6 @@
 {
   	"scriptName": "Local",
+  	"id": "local",
   	"compatibleOperatingSystems": ["LINUX"],
   	"testingOperatingSystems": [],
   	"free": false,

Applications/Games/18 Wheels of Steel Across America/application.json

@@ -1,4 +1,5 @@
 {
 	"name":	"18 Wheels of Steel: Across America",
+	"id":	"18_wheels_of_steel_across_america",
 	"description": "Heed the call of the open road, throw the gears in motion and take off in a tractor trailer. Drive faster than your competition, haul your cargo across the entire United States and feel the wind in your face as you control your own destiny. Blast the horn and build a career in the fast-paced world of trucking."
-}
+}

Applications/Games/Age of Empires II HD/Steam/script.js

@@ -1,12 +1,12 @@
-include(["Engines", "Wine", "QuickScript", "SteamScript"]);
-include(["Utils", "Functions", "Filesystem", "Files"]);
+include(["engines", "wine", "quick_script", "steam_script"]);
+include(["utils", "functions", "filesystem", "files"]);
 
 new SteamScript()
     .name("Age of Empires II HD")
     .editor("Skybox Labs, Hidden Path Entertainment, Ensemble Studios")
     .author("Plata")
     .appId(221380)
-    .postInstall(function(wine, wizard) {
+    .postInstall(function (wine/*, wizard*/) {
         // skip broken launcher by replacing it with "AoK HD.exe"
         var installPath = wine.prefixDirectory + "drive_c/" + wine.programFiles() + "/Steam/steamapps/common/Age2HD/";
         var launcher = installPath + "Launcher.exe";

Applications/Games/Age of Empires II HD/Steam/script.json

@@ -1,5 +1,6 @@
 {
 	"scriptName": "Steam",
+	"id": "steam",
 	"compatibleOperatingSystems": ["LINUX"],
 	"testingOperatingSystems": [],
 	"free": false,

Applications/Games/Age of Empires II HD/application.json

@@ -1,4 +1,5 @@
 {
 	"name":	"Age of Empires II HD",
+	"id":	"age_of_empires_2_hd",
 	"description": "Age of Empires II has been re-imagined in high definition with new features, trading cards, improved AI, workshop support, multiplayer, Steamworks integration and more!"
 }