Browse Source

Variable version

Ernesto Carrea 5 years ago
parent
commit
71000cbd8a

+ 4 - 1
src/hst_autocompile.sh

@@ -389,6 +389,7 @@ if [ "$NGINX_B" = true ] ; then
     if [ "$BUILD_RPM" = true ]; then
         # Get RHEL package files
         get_branch_file 'src/rpm/nginx/hestia-nginx.spec' "${BUILD_DIR_HESTIANGINX}/hestia-nginx.spec"
+        sed -i "s/%HESTIA-NGINX-VERSION%/${NGINX_V}/g" "${BUILD_DIR_HESTIANGINX}/hestia-nginx.spec"
         get_branch_file 'src/rpm/nginx/hestia-nginx.service' "${BUILD_DIR_HESTIANGINX}/hestia-nginx.service"
 
         # Custom config
@@ -505,6 +506,7 @@ if [ "$PHP_B" = true ] ; then
     if [ "$BUILD_RPM" = true ]; then
         # Get RHEL package files
         get_branch_file 'src/rpm/php/hestia-php.spec' "${BUILD_DIR_HESTIAPHP}/hestia-php.spec"
+        sed -i "s/%HESTIA-PHP-VERSION%/${PHP_V}/g" "${BUILD_DIR_HESTIAPHP}/hestia-php.spec"
         get_branch_file 'src/rpm/php/hestia-php.service' "${BUILD_DIR_HESTIAPHP}/hestia-php.service"
 
         # Get custom config
@@ -592,6 +594,7 @@ if [ "$HESTIA_B" = true ]; then
     if [ "$BUILD_RPM" = true ]; then
         # Get RHEL package files
         get_branch_file 'src/rpm/hestia/hestia.spec' "${BUILD_DIR_HESTIA}/hestia.spec"
+        sed -i "s/%HESTIA-VERSION%/${HESTIA_V}/g" "${BUILD_DIR_HESTIA}/hestia.spec"
         get_branch_file 'src/rpm/hestia/hestia.service' "${BUILD_DIR_HESTIA}/hestia.service"
 
         # Build RPM package
@@ -631,4 +634,4 @@ if [ "$install" = 'yes' ] || [ "$install" = 'y' ] || [ "$install" = 'true' ]; th
         done
     fi
     unset $answer
-fi
+fi

+ 1 - 1
src/rpm/hestia/hestia.spec

@@ -1,5 +1,5 @@
 Name:           hestia
-Version:        1.2.0
+Version:        %HESTIA-VERSION%
 Release:        0
 Summary:        Hestia Control Panel
 Group:          System Environment/Base

+ 1 - 1
src/rpm/nginx/hestia-nginx.spec

@@ -1,5 +1,5 @@
 Name:           hestia-nginx
-Version:        1.17.8
+Version:        %HESTIA-NGINX-VERSION%
 Release:        0
 Summary:        Hestia internal nginx web server
 Group:          System Environment/Base

+ 1 - 1
src/rpm/php/hestia-php.spec

@@ -1,5 +1,5 @@
 Name:           hestia-php
-Version:        7.4.6
+Version:        %HESTIA-PHP-VERSION%
 Release:        0
 Summary:        Hestia internal PHP
 Group:          System Environment/Base