Browse Source

Fix local src builds and php version

cmstew 5 năm trước cách đây
mục cha
commit
f5bf640f04
2 tập tin đã thay đổi với 5 bổ sung3 xóa
  1. 1 1
      src/deb/php/control
  2. 4 2
      src/hst_autocompile.sh

+ 1 - 1
src/deb/php/control

@@ -1,7 +1,7 @@
 Source: hestia-php
 Source: hestia-php
 Package: hestia-php
 Package: hestia-php
 Priority: optional
 Priority: optional
-Version: 7.4.12-1
+Version: 7.4.12
 Section: admin
 Section: admin
 Maintainer: HestaCP <info@hestiacp.com>
 Maintainer: HestaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
 Homepage: https://www.hestiacp.com

+ 4 - 2
src/hst_autocompile.sh

@@ -75,8 +75,12 @@ fi
 # Set Version for compiling
 # Set Version for compiling
 if [ -f "$SRC_DIR/src/deb/hestia/control" ] && [ "$branch" = '~localsrc' ]; then
 if [ -f "$SRC_DIR/src/deb/hestia/control" ] && [ "$branch" = '~localsrc' ]; then
   BUILD_VER=$(cat $SRC_DIR/src/deb/hestia/control |grep "Version:" |cut -d' ' -f2)
   BUILD_VER=$(cat $SRC_DIR/src/deb/hestia/control |grep "Version:" |cut -d' ' -f2)
+  NGINX_V=$(cat $SRC_DIR/src/deb/nginx/control |grep "Version:" |cut -d' ' -f2)
+  PHP_V=$(cat $SRC_DIR/src/deb/php/control |grep "Version:" |cut -d' ' -f2)
 else
 else
   BUILD_VER=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/hestia/control |grep "Version:" |cut -d' ' -f2)
   BUILD_VER=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/hestia/control |grep "Version:" |cut -d' ' -f2)
+  NGINX_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/nginx/control |grep "Version:" |cut -d' ' -f2)
+  PHP_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/php/control |grep "Version:" |cut -d' ' -f2)
 fi
 fi
 
 
 if [ -z "$BUILD_VER" ]; then
 if [ -z "$BUILD_VER" ]; then
@@ -86,11 +90,9 @@ fi
 
 
 BUILD_ARCH='amd64'
 BUILD_ARCH='amd64'
 HESTIA_V="${BUILD_VER}_${BUILD_ARCH}"
 HESTIA_V="${BUILD_VER}_${BUILD_ARCH}"
-NGINX_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/nginx/control |grep "Version:" |cut -d' ' -f2)
 OPENSSL_V='1.1.1g'
 OPENSSL_V='1.1.1g'
 PCRE_V='8.44'
 PCRE_V='8.44'
 ZLIB_V='1.2.11'
 ZLIB_V='1.2.11'
-PHP_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/php/control |grep "Version:" |cut -d' ' -f2)
 
 
 # Create build directories
 # Create build directories
 rm -rf $BUILD_DIR
 rm -rf $BUILD_DIR