Merge pull request #5 from NotAProton/refactor

Version and Refactor

manifest.json

@@ -1,62 +1,62 @@
 {
-	"manifest_version": 2,
-	"icons": {
-		"48": "icon/48.png",
-		"128": "icon/128.png",
-		"150": "icon/150.png",
-		"176": "icon/176.png",
-		"512": "icon/512.png"
-	},
-	"default_locale": "en",
-	"name": "Universal Bypass",
-	"description": "__MSG_appDesc__",
-	"homepage_url": "https://universal-bypass.org/",
-	"version": "13.15.2",
-	"author": "Sainan",
-	"permissions": [
-		"alarms",
-		"storage",
-		"webRequest",
-		"webRequestBlocking",
-		"<all_urls>"
-	],
-	"options_ui": {
-		"page": "html/options.html",
-		"open_in_tab": true
-	},
-	"browser_action": {
-		"default_icon": {
-			"48": "icon/48.png",
-			"128": "icon/128.png",
-			"150": "icon/150.png",
-			"176": "icon/176.png",
-			"512": "icon/512.png"
-		},
-		"default_popup": "html/popup.html"
-	},
-	"background": {
-		"scripts": [
-			"background.js"
-		]
-	},
-	"content_scripts": [
-		{
-			"matches": [
-				"<all_urls>"
-			],
-			"js": [
-				"content_script.js"
-			],
-			"run_at": "document_start"
-		}
-	],
-	"web_accessible_resources": [
-		"html/before-navigate.html",
-		"html/blocked.html",
-		"html/crowd-bypassed.html",
-		"html/firstrun.html",
-		"html/firstrun-noscript.html",
-		"html/options.html",
-		"icon/48.png"
-	]
-}
+  "manifest_version": 2,
+  "icons": {
+    "48": "icon/48.png",
+    "128": "icon/128.png",
+    "150": "icon/150.png",
+    "176": "icon/176.png",
+    "512": "icon/512.png"
+  },
+  "default_locale": "en",
+  "name": "Universal Bypass",
+  "description": "__MSG_appDesc__",
+  "homepage_url": "https://universal-bypass.org/",
+  "version": "13.5.2",
+  "author": "Sainan",
+  "permissions": [
+    "alarms",
+    "storage",
+    "webRequest",
+    "webRequestBlocking",
+    "<all_urls>"
+  ],
+  "options_ui": {
+    "page": "html/options.html",
+    "open_in_tab": true
+  },
+  "browser_action": {
+    "default_icon": {
+      "48": "icon/48.png",
+      "128": "icon/128.png",
+      "150": "icon/150.png",
+      "176": "icon/176.png",
+      "512": "icon/512.png"
+    },
+    "default_popup": "html/popup.html"
+  },
+  "background": {
+    "scripts": [
+      "background.js"
+    ]
+  },
+  "content_scripts": [
+    {
+      "matches": [
+        "<all_urls>"
+      ],
+      "js": [
+        "content_script.js"
+      ],
+      "run_at": "document_start"
+    }
+  ],
+  "web_accessible_resources": [
+    "html/before-navigate.html",
+    "html/blocked.html",
+    "html/crowd-bypassed.html",
+    "html/firstrun.html",
+    "html/firstrun-noscript.html",
+    "html/options.html",
+    "icon/48.png"
+  ]
+}

platform_spec/chromium/manifest.json

@@ -0,0 +1,62 @@
+{
+	"manifest_version": 2,
+	"icons": {
+		"48": "icon/48.png",
+		"128": "icon/128.png",
+		"150": "icon/150.png",
+		"176": "icon/176.png",
+		"512": "icon/512.png"
+	},
+	"default_locale": "en",
+	"name": "Universal Bypass",
+	"description": "__MSG_appDesc__",
+	"homepage_url": "https://universal-bypass.org/",
+	"version": "13.15.2",
+	"author": "Sainan",
+	"permissions": [
+		"alarms",
+		"storage",
+		"webRequest",
+		"webRequestBlocking",
+		"<all_urls>"
+	],
+	"options_ui": {
+		"page": "html/options.html",
+		"open_in_tab": true
+	},
+	"browser_action": {
+		"default_icon": {
+			"48": "icon/48.png",
+			"128": "icon/128.png",
+			"150": "icon/150.png",
+			"176": "icon/176.png",
+			"512": "icon/512.png"
+		},
+		"default_popup": "html/popup.html"
+	},
+	"background": {
+		"scripts": [
+			"background.js"
+		]
+	},
+	"content_scripts": [
+		{
+			"matches": [
+				"<all_urls>"
+			],
+			"js": [
+				"content_script.js"
+			],
+			"run_at": "document_start"
+		}
+	],
+	"web_accessible_resources": [
+		"html/before-navigate.html",
+		"html/blocked.html",
+		"html/crowd-bypassed.html",
+		"html/firstrun.html",
+		"html/firstrun-noscript.html",
+		"html/options.html",
+		"icon/48.png"
+	]
+}

scripts/chromium.sh

@@ -4,43 +4,42 @@
 # Usage: chromium.sh [argument]
 #  Arguments: {none} : dev package
 #             nover  : Creates a package without version number
-#               ver  : Creates a package with version number
+#               ver  : Creates a package with version number as specified in version.txt
 
 set -e
 
 echo "*** Universal-bypass.Chromium: Creating package..."
 DES=build/universal-bypass.chromium
 DIST=build/dist
-rm -rf $DES
-mkdir -p $DES
-rm -rf $DIST
-mkdir -p $DIST
+rm -rf      ./$DES
+mkdir -p    ./$DES
+rm -rf      ./$DIST
+mkdir -p    ./$DIST
 
 echo "*** Universal-bypass.Chromium: Copying files"
-cp -R html/ $DES
-cp -R _locales/ $DES
-cp -R icon/ $DES
-cp -R icon_disabled/ $DES
-cp -RT js/ $DES
-cp manifest.json $DES
-cp rules.json $DES
-cp PRIVACY.md $DES
+bash ./scripts/copy_common.sh              $DES
+cp platform_spec/chromium/manifest.json    $DES
 
 cd $DES
 
 if [[ $# -eq 0 ]]; then
     echo "*** Universal-bypass.Chromium: Creating dev package... (Tip: Use nover to create a normal package)"
+    bash ../../scripts/version.sh manifest.json .0
     zip -qr ../$(basename $DIST)/UniversalBypass_chromium_dev.zip .
 
-elif [[ "$1" == "nover" ]] ; then
+elif [ "$1" == "nover" ] ; then
     echo "*** Universal-bypass.Chromium: Creating non-versioned package... "
     rm injection_script.js
+    rm rules.json
+    bash ../../scripts/version.sh manifest.json no
     zip -qr ../$(basename $DIST)/UniversalBypass_chromium_0.zip .
 
-elif [[ "$1" == "ver" ]]; then
+elif [ "$1" == "ver" ]; then
     echo "*** Universal-bypass.Chromium: Creating versioned package... "
     rm injection_script.js
-    zip -qr ../$(basename $DIST)/UniversalBypass_"$2"_chromium.zip .
+    rm rules.json
+    bash ../../scripts/version.sh manifest.json
+    zip -qr ../$(basename $DIST)/UniversalBypass_$(cat ../../src/version.txt)_chromium.zip .
 
 fi
 

scripts/copy_common.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# This script assumes a linux environment
+
+set -e
+
+DES=$1
+
+#bash ./tools/make-assets.sh        $DES
+
+cp -R src/html/             $DES
+cp -R src/_locales/         $DES
+cp -R src/icon/             $DES
+cp -R src/icon_disabled/    $DES
+cp -RT src/js/              $DES
+cp PRIVACY.md               $DES

scripts/version.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+# This script assumes a linux environment
+
+set -e
+
+manifest_loc=$1
+
+
+if [[ $# -lt 2 ]]; then
+    version=$(cat ../../src/version.txt)
+    sed -i '/"version":/c\  "version": "'$version'",' $1
+    echo vesrioned $(basename $1) to $version
+
+  elif [ "$2" = "no" ]; then
+    version="0.$(git shortlog | grep -E '^[ ]+\w+' | wc -l)"
+    sed -i '/"version":/c\  "version": "'$version'",' $1
+    echo vesrioned $(basename $1) to $version
+
+  else
+    version="0.$(git shortlog | grep -E '^[ ]+\w+' | wc -l).$2"
+    sed -i '/"version":/c\  "version": "'$version'",' $1
+    echo vesrioned $(basename $1) to $version
+fi
+

src/html/popup.html

@@ -0,0 +1 @@
+<script src="base.js"></script><script src="popup.js"></script>

html/popup.js → src/html/popup.js

@@ -1,2 +1,2 @@
 brws.runtime.sendMessage({type: "open-tab", url: brws.runtime.getURL("/html/options.html")})
-window.close()
+window.close()

js/.jshintrc → src/js/.jshintrc

@@ -2,4 +2,4 @@
 	"asi": true,
 	"esversion": 6,
 	"evil": true
-}
+}

src/version.txt

@@ -0,0 +1 @@
+0.0.0