|
|
@@ -86,11 +86,11 @@ fi
|
|
|
|
|
|
BUILD_ARCH='amd64'
|
|
|
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 |cut -d"~" -f1)
|
|
|
+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'
|
|
|
PCRE_V='8.44'
|
|
|
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 |cut -d"~" -f1)
|
|
|
+PHP_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/php/control |grep "Version:" |cut -d' ' -f2)
|
|
|
|
|
|
# Create build directories
|
|
|
rm -rf $BUILD_DIR
|
|
|
@@ -176,11 +176,11 @@ GIT_REP='https://raw.githubusercontent.com/hestiacp/hestiacp/'$branch'/src/deb'
|
|
|
|
|
|
# Generate Links for sourcecode
|
|
|
HESTIA_ARCHIVE_LINK='https://github.com/hestiacp/hestiacp/archive/'$branch'.tar.gz'
|
|
|
-NGINX='https://nginx.org/download/nginx-'$NGINX_V'.tar.gz'
|
|
|
+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'
|
|
|
PCRE='https://ftp.pcre.org/pub/pcre/pcre-'$PCRE_V'.tar.gz'
|
|
|
ZLIB='https://www.zlib.net/zlib-'$ZLIB_V'.tar.gz'
|
|
|
-PHP='http://de2.php.net/distributions/php-'$PHP_V'.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.
|
|
|
branch=$(echo "$branch" |sed 's/\//-/g');
|