Merge pull request #2505 from mneunomne/master

Minor fixes + add version-check for reference

Author: mneunomne

src/js/adn/core.js

@@ -1940,19 +1940,19 @@ const adnauseam = (function () {
   const verifyVersion = exports.verifyVersion = async function () {
     const version = vAPI.app.version;
     console.log("current version: " + version);
-    if (version.includes('b')) {
-      console.log("beta version, don't check for updates");
-      return;
-    }
+    //if (version.includes('b')) {
+      //console.log("beta version, don't check for updates");
+      //return;
+    //}
     // run get request on /repos/dhowe/AdNauseam/releases
-    const response = await fetch("https://api.github.com/repos/dhowe/AdNauseam/releases");
+    const response = await fetch("https://api.github.com/repos/dhowe/AdNauseam/releases/latest");
     // validate
     if (!response.ok) {
       //throw new Error(`HTTP error! status: ${response.status}`);
     }
     // parse response
-    const releases = await response.json();
-    const latestRelease = releases[0];
+    const latestRelease = await response.json();
+    console.log("latestRelease", latestRelease)
     const latestVersion = latestRelease.tag_name.replace('v', '');
     console.log("latest version: " + latestVersion);
 

tools/make-artifacts.sh

@@ -12,7 +12,7 @@ case "$(uname -sr)" in
   Darwin*)
     echo 'Mac OS X'
     CHROME=/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome
-    FIREFOX=/Applications/Firefox.app/Contents/MacOS/firefox-bin
+    FIREFOX=/Applications/Firefox.app/Contents/MacOS/firefox
     OPERA=/Applications/Opera.app/Contents/MacOS/Opera 
     ;;
   Linux*)
@@ -126,7 +126,7 @@ fi
 if [ $DO_FIREFOX = true ]
 then
   printf '\n%s' "*** Target -> "
-  command "${FIREFOX}" -v || { echo >&2 "Firefox is not installed."; exit 1; }
+  # command "${FIREFOX}" -v || { echo >&2 "Firefox is not installed."; exit 1; }
   ./tools/make-firefox.sh all
   web-ext build -s ${DES}/adnauseam.firefox -a ${ARTS}
   mv ${ARTS}/adnauseam-${VERSION}.zip ${ARTS}/adnauseam-${VERSION}.firefox.zip

tools/version-check.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Make sure you have jq installed AND be on the folder where 'adnauseam.chromium' is located
+
+# Path to the adnauseam.chromium directory
+EXTENSION_DIR="adnauseam.chromium"
+
+# Path to the manifest.json file
+MANIFEST_FILE="$EXTENSION_DIR/manifest.json"
+
+# Check if the directory exists
+if [ -d "$EXTENSION_DIR" ]; then
+    # Get the current version from the manifest file
+    CURRENT_VERSION=$(jq -r .version "$MANIFEST_FILE")
+    CURRENT_VERSION="v$CURRENT_VERSION"
+    echo "Current version: $CURRENT_VERSION"
+
+    # Replace URL with the actual URL you want to use
+    URL="https://api.github.com/repos/dhowe/AdNauseam/releases/latest"
+
+    # Get the latest release information using curl and jq
+    LATEST_RELEASE=$(curl -s "$URL" | jq -r '.tag_name')
+
+    # Check if the latest version is different from the current version
+    if [ "$LATEST_RELEASE" != "$CURRENT_VERSION" ]; then
+        echo "Updating AdNauseam extension..."
+
+        # Download and extract the latest release
+        curl -L -o "$EXTENSION_DIR.zip" "https://github.com/dhowe/AdNauseam/releases/download/$LATEST_RELEASE/adnauseam.chromium.zip"
+        unzip -q "$EXTENSION_DIR.zip" -d "./"
+        rm "$EXTENSION_DIR.zip"
+
+        echo "Update complete. Installed version: $LATEST_RELEASE"
+    else
+        echo "AdNauseam is already up to date. Installed version: $CURRENT_VERSION"
+    fi
+else
+    echo "AdNauseam extension directory not found. Please make sure it is installed."
+fi