Merge branch 'servicing' into release

hestiacp · Aug 24, 2023 · 8c55ac6 · 8c55ac6
2 parents 322cd39 + df38781
commit 8c55ac6
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.8.7] - Service release
+
+### Bugfixes
+
+- Fix typo in v-update-whitelabel-logo
+
 ## [1.8.6] - Service release
 
 ### Features

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 <h2 align="center">A lightweight and powerful control panel for the modern web</h2>
 
-<p align="center"><strong>Latest stable release:</strong> Version 1.8.6 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
+<p align="center"><strong>Latest stable release:</strong> Version 1.8.7 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
 
 <p align="center">
 	<a href="https://www.hestiacp.com/">HestiaCP.com</a> |

diff --git a/bin/v-update-white-label-logo b/bin/v-update-white-label-logo
@@ -37,7 +37,7 @@ elif [ ! -f "$HESTIA/web/images/custom/logo.svg" ] && [ "$download" = "yes" ]; t
 fi
 
 if [ -f "$HESTIA/web/images/custom/logo.png" ]; then
-	cp -f $"HESTIA/web/images/custom/logo.png" "$HESTIA/web/images/logo.png"
+	cp -f "$HESTIA/web/images/custom/logo.png" "$HESTIA/web/images/logo.png"
 elif [ ! -f "$HESTIA/web/images/custom/logo.png" ] && [ "$download" = "yes" ]; then
 	download_file "https://raw.githubusercontent.com/hestiacp/hestiacp/release/web/images/logo.png" "$HESTIA/web/images/logo.png"
 fi
@@ -49,7 +49,7 @@ elif [ ! -f "$HESTIA/web/images/custom/logo-header.svg" ] && [ "$download" = "ye
 fi
 
 if [ -f "$HESTIA/web/images/custom/favicon.png" ]; then
-	cp -f" $HESTIA/web/images/custom/favicon.png" "$HESTIA/web/images/favicon.png"
+	cp -f "$HESTIA/web/images/custom/favicon.png" "$HESTIA/web/images/favicon.png"
 elif [ ! -f "$HESTIA/web/images/custom/favicon.png" ] && [ "$download" = "yes" ]; then
 	download_file "https://raw.githubusercontent.com/hestiacp/hestiacp/release/web/images/favicon.png" "$HESTIA/web/images/favicon.png"
 fi

diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.8.6'
+HESTIA_INSTALL_VER='1.8.7'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.2"

diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.8.6'
+HESTIA_INSTALL_VER='1.8.7'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.2"

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "hestia",
 	"private": true,
-	"version": "1.8.6",
+	"version": "1.8.7",
 	"description": "An open-source Linux web server control panel.",
 	"repository": "https://github.com/hestiacp/hestiacp",
 	"license": "GPL-3.0-or-later",

diff --git a/src/deb/hestia/control b/src/deb/hestia/control
@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.8.6
+Version: 1.8.7
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

diff --git a/src/rpm/hestia/hestia.spec b/src/rpm/hestia/hestia.spec
@@ -2,7 +2,7 @@
 %global _hardened_build 1
 
 Name:           hestia
-Version:        1.8.6
+Version:        1.8.7
 Release:        1%{dist}
 Summary:        Hestia Control Panel
 Group:          System Environment/Base