Корректировка mariadb

install/700-apache.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
-title "Installing apache2..."
+echo
+echo "==============================================="
+echo "Installing apache2..."
+echo "==============================================="
+echo
 
-apti apache2
+sudo apt install -y --autoremove apache2
 sudo service apache2 restart
-success "$(apache2 -v)"
+apache2 -v

install/710-php.sh

@@ -1,28 +1,32 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
 PHPVER="8.1"
-title "Installing php${PHPVER}..."
+echo
+echo "==============================================="
+echo "Installing php${PHPVER}..."
+echo "==============================================="
+echo
 
 sudo LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php
-apti php${PHPVER} \
-     php${PHPVER}-xdebug \
-     php${PHPVER}-bcmath \
-     php${PHPVER}-bz2 \
-     php${PHPVER}-curl \
-     php${PHPVER}-gd \
-     php${PHPVER}-json \
-     php${PHPVER}-mbstring \
-     php${PHPVER}-mysql \
-     php${PHPVER}-opcache \
-     php${PHPVER}-pgsql \
-     php${PHPVER}-soap \
-     php${PHPVER}-xml \
-     php${PHPVER}-xmlrpc \
-     php${PHPVER}-xsl \
-     php${PHPVER}-zip
-   # php${PHPVER}-common
-   # php${PHPVER}-cli
-   # php${PHPVER}-dba
-   # php${PHPVER}-ldap
-   # php${PHPVER}-sqlite3
+sudo apt install -y --autoremove \
+    php${PHPVER} \
+    php${PHPVER}-cli \
+    php${PHPVER}-common \
+    php${PHPVER}-xdebug \
+    # php${PHPVER}-bcmath \
+    # php${PHPVER}-bz2 \
+    # php${PHPVER}-curl \
+    # php${PHPVER}-gd \
+    # php${PHPVER}-json \
+    # php${PHPVER}-mbstring \
+    # php${PHPVER}-mysql \
+    # php${PHPVER}-opcache \
+    # php${PHPVER}-pgsql \
+    # php${PHPVER}-soap \
+    # php${PHPVER}-xml \
+    # php${PHPVER}-xmlrpc \
+    # php${PHPVER}-xsl \
+    # php${PHPVER}-sqlite3 \
+    # php${PHPVER}-zip
+    # php${PHPVER}-dba
+    # php${PHPVER}-ldap
 php -v

install/730-oci8.sh_

@@ -1,6 +1,9 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
-title "Installing oci8..."
+echo
+echo "==============================================="
+echo "Installing oci8..."
+echo "==============================================="
+echo
 
 #check for
 # wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip
@@ -16,14 +19,19 @@ sudo mv ~/Downloads/instant_client/ /opt/oracle/
 sudo sh -c "echo /opt/oracle/instant_client > /etc/ld.so.conf.d/oracle-instantclient.conf"
 sudo ldconfig
 
-apti php-dev php-pear build-essential libaio1 default-jdk
+sudo apt install -y --autoremove \
+    php-dev \
+    php-pear \
+    build-essential \
+    libaio1 \
+    default-jdk
 sudo pecl channel-update pecl.php.net
-#sudo pecl install oci8 # php8
-sudo pecl install oci8-2.2.0 # php7
+sudo pecl install oci8 # php8
+#sudo pecl install oci8-2.2.0 # php7
 
 #sh -c "echo '; priority=10' > /etc/php/7.4/mods-available/oci8.ini"
-sudo sh -c "echo 'extension=oci8.so' >> /etc/php/7.4/mods-available/oci8.ini"
-sudo chmod 0644 /etc/php/7.4/mods-available/oci8.ini
+# sudo sh -c "echo 'extension=oci8.so' >> /etc/php/7.4/mods-available/oci8.ini"
+# sudo chmod 0644 /etc/php/7.4/mods-available/oci8.ini
 sudo phpenmod oci8
 php -i | grep oci8
 
@@ -36,4 +44,4 @@ php -i | grep oci8
 
 
 # https://pecl.php.net/package/oci8
-sudo pecl install oci8-2.2.0
+#sudo pecl install oci8-2.2.0

install/800-mariadb.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+echo
+echo "==============================================="
+echo "Installing mariadb..."
+echo "==============================================="
+echo
+
+installed() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+sudo apt install -y --autoremove mariadb-server mariadb-client
+sudo mysql_secure_installation
+installed "php" && sudo apt install -y --autoremove php-mysql phpmyadmin

install/800-mysql.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-. "../src/01-common.sh" || exit 5
-title "Installing mariadb..."
-
-apti mariadb-server mariadb-client
-sudo mysql_secure_installation
-installed "php" && apti php-mysql phpmyadmin
-installed "mysql" && success "mariadb installed!"