From 4268e884fc1124ef226d58cf690f62d956f70ad1 Mon Sep 17 00:00:00 2001
From: Weilbyte <me@weilbyte.dev>
Date: Thu, 6 May 2021 09:12:19 +0200
Subject: [PATCH] Improve install process (fix #73)
---
PVEDiscordDark.sh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/PVEDiscordDark.sh b/PVEDiscordDark.sh
index 0d094e9..9f765cd 100644
--- a/PVEDiscordDark.sh
+++ b/PVEDiscordDark.sh
@@ -65,9 +65,9 @@ function checkSupported {
}
function isInstalled {
- if (grep -Fq "<link rel='stylesheet' type='text/css' href='/pve2/css/dd_style.css'>" $TEMPLATE_FILE ||
- grep -Fq "<script type='text/javascript' src='/pve2/js/dd_patcher.js'></script>" $TEMPLATE_FILE ||
- [ -f "/usr/share/pve-manager/css/dd_style.css" ] ); then
+ if (grep -Fq "<link rel='stylesheet' type='text/css' href='/pve2/css/dd_style.css'>" $TEMPLATE_FILE &&
+ grep -Fq "<script type='text/javascript' src='/pve2/js/dd_patcher.js'></script>" $TEMPLATE_FILE &&
+ [ -f "/usr/share/pve-manager/css/dd_style.css" ] && [ -f "/usr/share/pve-manager/js/dd_patcher.js" ]); then
true
else
false
@@ -133,8 +133,12 @@ function install {
curl -s $BASE_URL/PVEDiscordDark/js/PVEDiscordDark.js > /usr/share/pve-manager/js/dd_patcher.js
if [ "$_silent" = false ]; then echo -e "${CHECKMARK} Applying changes to template file"; fi
- echo "<link rel='stylesheet' type='text/css' href='/pve2/css/dd_style.css'>" >> $TEMPLATE_FILE
- echo "<script type='text/javascript' src='/pve2/js/dd_patcher.js'></script>" >> $TEMPLATE_FILE
+ if !(grep -Fq "<link rel='stylesheet' type='text/css' href='/pve2/css/dd_style.css'>" $TEMPLATE_FILE); then
+ echo "<link rel='stylesheet' type='text/css' href='/pve2/css/dd_style.css'>" >> $TEMPLATE_FILE
+ fi
+ if !(grep -Fq "<script type='text/javascript' src='/pve2/js/dd_patcher.js'></script>" $TEMPLATE_FILE); then
+ echo "<script type='text/javascript' src='/pve2/js/dd_patcher.js'></script>" >> $TEMPLATE_FILE
+ fi
local IMAGELIST=$(curl -f -s "$BASE_URL/meta/imagelist")
local IMAGELISTARR=($(echo "$IMAGELIST" | tr ',' '\n'))
--
GitLab