Просмотр исходного кода

Adjust php versioning to - seperator

Raphael Schneeberger 5 лет назад
Родитель
Сommit
0fe2480cd4
2 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      src/deb/php/control
  2. 3 3
      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.11~1
+Version: 7.4.11-1
 Section: admin
 Section: admin
 Maintainer: HestaCP <info@hestiacp.com>
 Maintainer: HestaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
 Homepage: https://www.hestiacp.com

+ 3 - 3
src/hst_autocompile.sh

@@ -180,7 +180,7 @@ NGINX='https://nginx.org/download/nginx-'$(echo $NGINX_V |cut -d"~" -f1)'.tar.gz
 OPENSSL='https://www.openssl.org/source/openssl-'$OPENSSL_V'.tar.gz'
 OPENSSL='https://www.openssl.org/source/openssl-'$OPENSSL_V'.tar.gz'
 PCRE='https://ftp.pcre.org/pub/pcre/pcre-'$PCRE_V'.tar.gz'
 PCRE='https://ftp.pcre.org/pub/pcre/pcre-'$PCRE_V'.tar.gz'
 ZLIB='https://www.zlib.net/zlib-'$ZLIB_V'.tar.gz'
 ZLIB='https://www.zlib.net/zlib-'$ZLIB_V'.tar.gz'
-PHP='http://de2.php.net/distributions/php-'$(echo $PHP_V |cut -d"~" -f1)'.tar.gz'
+PHP='http://de2.php.net/distributions/php-'$(echo $PHP_V |cut -d"-" -f1)'.tar.gz'
 
 
 # Forward slashes in branchname are replaced with dashes to match foldername in github archive.
 # Forward slashes in branchname are replaced with dashes to match foldername in github archive.
 branch=$(echo "$branch" |sed 's/\//-/g');
 branch=$(echo "$branch" |sed 's/\//-/g');
@@ -330,7 +330,7 @@ if [ "$PHP_B" = true ] ; then
     download_file $PHP '-' | tar xz
     download_file $PHP '-' | tar xz
 
 
     # Change to php directory
     # Change to php directory
-    cd php-$(echo $PHP_V |cut -d"~" -f1)
+    cd php-$(echo $PHP_V |cut -d"-" -f1)
 
 
     # Configure PHP
     # Configure PHP
     ./configure   --prefix=/usr/local/hestia/php \
     ./configure   --prefix=/usr/local/hestia/php \
@@ -355,7 +355,7 @@ if [ "$PHP_B" = true ] ; then
 
 
     # Cleare up unused files
     # Cleare up unused files
     cd $BUILD_DIR
     cd $BUILD_DIR
-    rm -r php-$(echo $PHP_V |cut -d"~" -f1)
+    rm -r php-$(echo $PHP_V |cut -d"-" -f1)
 
 
     # Prepare Deb Package Folder Structure
     # Prepare Deb Package Folder Structure
     cd hestia-php_$PHP_V/
     cd hestia-php_$PHP_V/