Merge branch 'master' of https://github.com/Stevertus/mcscript

Author: Stevertus

bin/add.js

@@ -1,89 +1,89 @@
 const http = require('https');
 const fs = require('fs');
 
-// Add Pack (downloading pack from mediafire)
-exports.addPack = function(name){
 
-  let patt = new RegExp(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/)
+// Download File From url
+const download = function (url, name) {
 
-  if(patt.test(name)){
+    console.log("\x1b[36m", "Downloading " + name + ".zip ...", "\x1b[0m");
 
-    download(name, "external")
+    let file = fs.createWriteStream(name + '.zip');
+    let request = http.get(url, function (response) {
 
-  } else http.get("https://download1350.mediafire.com/q7aa9e774jug/oyrbdi6fbpqo1bl/mcscri%27%2B%27pt+packages.json", (res) => {
+        response.pipe(file);
+        response.on('end', () => {
+            console.log("\x1b[32m", "Download of " + name + ".zip finished!", "\x1b[0m")
+        });
 
-    res.setEncoding('utf8');
-    res.on('data', function (chunk) {
+    }).on('error', function (e) {
 
-      let packs = JSON.parse(chunk)
-      let obj = packs.find(obj => obj.name === name.toLowerCase())
+        console.log("\x1b[31m", "Got error: " + e.message, "\x1b[0m");
 
-      if(obj && obj.url){
-        console.log(obj.url.slice(0, 17))
-        if(obj.url.slice(0, 17) == "https://github.com" || obj.url.slice(0, 16) == "http://github.com") downloadFromRedirectLink(obj.url, obj.name)
+    });
+};
+// Add Pack (downloading pack from mediafire)
+exports.addPack = function (name) {
 
-          else download(obj.url, obj.name)
+    let patt = new RegExp(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/);
 
-        } else {
+    if (patt.test(name)) {
 
-          let packStr = ""
-          packs.forEach((e, i) => {
+        download(name, "external")
 
-            packStr += e.name
-            if(i != packs.length - 1) packStr += ", "
+    } else http.get("https://download1350.mediafire.com/q7aa9e774jug/oyrbdi6fbpqo1bl/mcscri%27%2B%27pt+packages.json", (res) => {
 
-          })
+        res.setEncoding('utf8');
+        res.on('data', function (chunk) {
 
-          console.log("\x1b[31m","Your pack was not found! Please use one of these: ","\x1b[0m")
-          console.log("\x1b[36m",packStr,"\x1b[0m")
+            let packs = JSON.parse(chunk);
+            let obj = packs.find(obj => obj.name === name.toLowerCase());
 
-        }
-      });
+            if (obj && obj.url) {
+                console.log(obj.url.slice(0, 17));
+                if (obj.url.slice(0, 17) === "https://github.com" || obj.url.slice(0, 16) === "http://github.com") downloadFromRedirectLink(obj.url, obj.name);
 
-  }).on('error', function(e) {
+                else download(obj.url, obj.name)
 
-      console.log("\x1b[31m","Got error: " + e.message,"\x1b[0m");
+            } else {
 
-  });
-}
+                let packStr = "";
+                packs.forEach((e, i) => {
 
-// Download File From url
-var download = function (url, name){
+                    packStr += e.name;
+                    if (i !== packs.length - 1) packStr += ", "
 
-  console.log("\x1b[36m","Downloading "+name+".zip ...","\x1b[0m")
+                });
 
-  let file = fs.createWriteStream(name + '.zip');
-  let request = http.get(url, function(response) {
+                console.log("\x1b[31m", "Your pack was not found! Please use one of these: ", "\x1b[0m");
+                console.log("\x1b[36m", packStr, "\x1b[0m")
 
-    response.pipe(file)
-    response.on('end', () => {
-      console.log("\x1b[32m","Download of "+name+".zip finished!","\x1b[0m")
-    });
+            }
+        });
 
-  }).on('error', function(e) {
+    }).on('error', function (e) {
 
-      console.log("\x1b[31m","Got error: " + e.message,"\x1b[0m");
+        console.log("\x1b[31m", "Got error: " + e.message, "\x1b[0m");
 
-  });
-}
+    });
+};
 
 // Download File From Redirected-Url (in this programm mostly github.com)
 function downloadFromRedirectLink(url, file) {
 
-    http.get(url, function(res) {
+    http.get(url, function (res) {
 
-        if(res.statusCode != 302){  // No redirect
+        if (res.statusCode !== 302) {  // No redirect
 
             console.log("error: no redirect found");
             return;
 
         }
 
-        download(res.headers.location,file);
+        download(res.headers.location, file);
 
-    }).on('error', function(e) {
+    }).on('error', function (e) {
 
-        console.log("\x1b[31m", "Got error: " + e.message,"\x1b[0m");
+        console.log("\x1b[31m", "Got error: " + e.message, "\x1b[0m");
 
     });
 }

bin/modal.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 const lib = require('../lib/index.js');
-lib.genModals(process.argv[2] || './')
+lib.genModals(process.argv[2] || './');

bin/test-module.js

@@ -5,9 +5,9 @@ const addPack = require('./add.js');
 const gen_new = require('../lib/gen_new.js');
 const consoletheme = require('../lib/consoletheme.js');
 
-var fullError = false;
-if(process.argv.indexOf("-fullErr") != -1){ //does our flag exist?
-    fullError = true
+let fullError = false;
+if(process.argv.indexOf("-fullErr") !== -1){ //does our flag exist?
+    fullError = true;
     process.argv.splice(process.argv.indexOf("-fullErr"),1)
 }
 

bin/watch.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 const lib = require('../lib/index.js');
-lib.watch(process.argv[2] || './')
+lib.watch(process.argv[2] || './');

lib/consoletheme.js

@@ -24,4 +24,4 @@ module.exports = {
   BgMagenta: "\x1b[45m",
   BgCyan: "\x1b[46m",
   BgWhite: "\x1b[47m",
-}
+};