diff --git a/.gp/bash/init-gitpod.sh b/.gp/bash/init-gitpod.sh index 9edb2833..24465e44 100644 --- a/.gp/bash/init-gitpod.sh +++ b/.gp/bash/init-gitpod.sh @@ -209,7 +209,7 @@ if [ ! -d "$GITPOD_REPO_ROOT/vendor" ]; then # Install https://www.ioncube.com/loaders.php installed_ioncube_gen=$(bash .gp/bash/utils.sh parse_ini_value starter.ini ioncube install) if [[ $installed_ioncube_gen == 1 ]]; then - if [[ $(bash .gp/bash/utils.sh comp_ver_lt "$current_php_version" 7.4) == 0 ]]; then + if [[ $(bash .gp/bash/utils.sh comp_ver_lt "$current_php_version" "8.0") == 1 ]]; then msg="Installing ioncube loader" log_silent "$msg" && start_spinner "$msg" \ && wget http://downloads3.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -O /tmp/ioncube.tar.gz \ diff --git a/.gp/bash/install-xdebug.sh b/.gp/bash/install-xdebug.sh index 32251352..389e0e54 100644 --- a/.gp/bash/install-xdebug.sh +++ b/.gp/bash/install-xdebug.sh @@ -17,7 +17,7 @@ xdebug_version='3.1.2' xdebug_binary_url="http://xdebug.org/files/xdebug-$xdebug_version.tgz" xdebug_ext_path="$(php -r 'echo ini_get("extension_dir");')/xdebug.so" -php_version="$(. /tmp/utils.sh parse_ini_value /tmp/starter.ini PHP version)" +php_version="$(. /tmp/utils.sh php_version)" log='/var/log/workspace-image.log' msg="Compiling and installing xdebug $xdebug_version from $xdebug_binary_url" @@ -37,12 +37,12 @@ php-fpm_conf "$php_version" wget "$xdebug_binary_url" \ && tar -xvzf "xdebug-$xdebug_version.tgz" \ && cd "xdebug-$xdebug_version" \ -&& /usr/bin/phpize7.4 \ +&& "/usr/bin/phpize$php_version" \ && ./configure --enable-xdebug \ && make \ && sudo cp modules/xdebug.so "$xdebug_ext_path" \ -&& sudo bash -c "echo -e \"$(xdebug_zend_ext_conf)\" >> \"/etc/php/$php_version/cli/php.ini\"" \ -&& sudo bash -c "echo -e \"$(xdebug_zend_ext_conf)\" >> \"/etc/php/$php_version/apache2/php.ini\"" \ +&& sudo bash -c "echo -e \"$(xdebug_zend_ext_conf)\" > \"/etc/php/$php_version/cli/conf.d/20-xdebug.ini\"" \ +&& sudo bash -c "echo -e \"$(xdebug_zend_ext_conf)\" > \"/etc/php/$php_version/apache2/conf.d/20-xdebug.ini\"" \ && sudo ln -s "/etc/php/$php_version/mods-available/20-xdebug.ini" "/etc/php/$php_version/fpm/conf.d" ec=$? if [[ $ec -eq 0 ]]; then