Browse Source

Fix path in template update scripts

Kristan Kenney 7 years ago
parent
commit
f78d3e2338
2 changed files with 6 additions and 10 deletions
  1. 3 5
      bin/v-update-dns-templates
  2. 3 5
      bin/v-update-web-templates

+ 3 - 5
bin/v-update-dns-templates

@@ -24,10 +24,8 @@ case $(head -n1 /etc/issue | cut -f 1 -d ' ') in
 esac
 
 # Detect version
-if [ "$type" = "ubuntu" ]; then
-    release="$(lsb_release -s -r)"
-elif [ "$type" = "ubuntu" ]; then
-    release=$(cat /etc/debian_version|grep -o [0-9]|head -n1)
+if [ "$type" = "ubuntu" ] || [ "$type" = "debian" ]; then
+    type="deb"
 else
     echo "Error: can't detect supported os"
     log_event "$E_NOTEXIST"
@@ -40,7 +38,7 @@ fi
 #----------------------------------------------------------#
 
 # Update templates
-cp -rf $HESTIA/install/$type/$release/templates/dns $HESTIA/data/templates/
+cp -rf $HESTIA/install/$type/templates/dns $HESTIA/data/templates/
 
 
 #----------------------------------------------------------#

+ 3 - 5
bin/v-update-web-templates

@@ -24,10 +24,8 @@ case $(head -n1 /etc/issue | cut -f 1 -d ' ') in
 esac
 
 # Detect version
-if [ "$type" = "ubuntu" ]; then
-    release="$(lsb_release -s -r)"
-elif [ "$type" = "debian" ]; then
-    release=$(cat /etc/debian_version|grep -o [0-9]|head -n1)
+if [ "$type" = "ubuntu" ] || [ "$type" = "debian" ]; then
+    type="deb"
 else
     echo "Error: can't detect supported os"
     log_event "$E_NOTEXIST"
@@ -40,7 +38,7 @@ fi
 #----------------------------------------------------------#
 
 # Update templates
-cp -rf $HESTIA/install/$type/$release/templates/web $HESTIA/data/templates/
+cp -rf $HESTIA/install/$type/templates/web $HESTIA/data/templates/
 
 # Rebuilding web domains
 for user in $($BIN/v-list-sys-users plain); do