v2.2.2

FIXED: Use relative path for addon URLs FIXED: Still show nvram/jffs if no swap configured
jackyaz · Apr 5, 2021 · 5c6a2e3 · 5c6a2e3
2 parents 00b74e5 + d758a40
commit 5c6a2e3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bfd397624cdf4803a465d4ae1530e7fe)](https://www.codacy.com/app/jackyaz/scMerlin?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=jackyaz/scMerlin&amp;utm_campaign=Badge_Grade)
 [![Build Status](https://travis-ci.com/jackyaz/scMerlin.svg?branch=master)](https://travis-ci.com/jackyaz/scMerlin)
 
-## v2.2.1
-### Updated on 2021-03-31
+## v2.2.2
+### Updated on 2021-04-05
 ## About
 scMerlin allows you to easily control the most common services/scripts on your router.
 

diff --git a/scmerlin.sh b/scmerlin.sh
@@ -22,8 +22,8 @@
 ### Start of script variables ###
 readonly SCRIPT_NAME="scMerlin"
 readonly SCRIPT_NAME_LOWER=$(echo $SCRIPT_NAME | tr 'A-Z' 'a-z' | sed 's/d//')
-readonly SCM_VERSION="v2.2.1"
-readonly SCRIPT_VERSION="v2.2.1"
+readonly SCM_VERSION="v2.2.2"
+readonly SCRIPT_VERSION="v2.2.2"
 SCRIPT_BRANCH="master"
 SCRIPT_REPO="https://raw.githubusercontent.com/jackyaz/$SCRIPT_NAME/$SCRIPT_BRANCH"
 readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"

diff --git a/scmerlin_www.asp b/scmerlin_www.asp
diff --git a/scmerlin_www.js b/scmerlin_www.js
@@ -438,7 +438,7 @@ function BuildAddonPageTable(addonname,addonurl,loopindex){
 		addonpageshtml+='<tr>';
 	}
 
-	addonpageshtml+='<td class="addonpageurl"><a href="'+addonurl+'">'+addonname+'</a><br /><span class="addonpageurl">'+addonurl.substring(addonurl.lastIndexOf("/")+1)+'</span></td>';
+	addonpageshtml+='<td class="addonpageurl"><a href="'+addonurl.substring(addonurl.lastIndexOf("/")+1)+'">'+addonname+'</a><br /><span class="addonpageurl">'+addonurl.substring(addonurl.lastIndexOf("/")+1)+'</span></td>';
 	if(loopindex > 0 && (loopindex+1) % 4 == 0){
 		addonpageshtml+='</tr>';
 	}