diff --git a/dapostinstall.sh b/dapostinstall.sh index a113039..ce69140 100755 --- a/dapostinstall.sh +++ b/dapostinstall.sh @@ -60,13 +60,12 @@ configure_custombuild_php() { build_php_extension() { local enabled="$1" - local option="$2" - local target="$3" + local extension="$2" [[ "$enabled" == "yes" ]] || return 0 cd "$CBDIR" - da build set "$option" yes - da build "$target" + da build set "$extension" yes + da build "$extension" } install_local_plugin_archive() { @@ -436,11 +435,11 @@ if [[ "$imagick" == "yes" ]]; then fi echo "Instalacja rozszerzen PHP z CustomBuild" -build_php_extension "$ioncube" "ioncube" "ioncube" -build_php_extension "$zend" "zend" "zend" -build_php_extension "$opcache" "opcache" "opcache" -build_php_extension "$imap" "php_imap" "php_imap" -build_php_extension "$imagick" "imagick" "imagick" +build_php_extension "$ioncube" "php_ioncube" +build_php_extension "$zend" "php_zend" +build_php_extension "$opcache" "php_opcache" +build_php_extension "$imap" "php_imap" +build_php_extension "$imagick" "php_imagick" echo "Instalacja Memcache" yum -y install memcached libmemcached diff --git a/tests/quality_checks.sh b/tests/quality_checks.sh index f040f98..56e4f68 100644 --- a/tests/quality_checks.sh +++ b/tests/quality_checks.sh @@ -156,11 +156,15 @@ assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" '\./build' assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" '^[[:space:]]*\$CBDIR/build' assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'da build set eximconf yes' assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'da build exim_conf' -assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$ioncube" "ioncube" "ioncube"' -assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$zend" "zend" "zend"' -assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$opcache" "opcache" "opcache"' -assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$imap" "php_imap" "php_imap"' -assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$imagick" "imagick" "imagick"' +assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$ioncube" "php_ioncube"' +assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$zend" "php_zend"' +assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$opcache" "php_opcache"' +assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$imap" "php_imap"' +assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$imagick" "php_imagick"' +assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$ioncube" "ioncube"' +assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$zend" "zend"' +assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$opcache" "opcache"' +assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'build_php_extension "\$imagick" "imagick"' assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'sed -i .*imagick=no' assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'sed -i .*imap=no' assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'yum -y install redis redis-devel'