Updated apache2

Makefile

@@ -1,7 +1,8 @@
-# Autogenerated at 04.07.2022 22:11 using ./gen-makefile.sh
+# Autogenerated at 04.07.2022 22:16 using ./gen-makefile.sh
 
 ##lamp: Apache + php + mariadb
 lamp: apache php mariadb
+
 ##apache: Install apache2 (latest)
 apache:
 	./install/apache
@@ -111,4 +112,4 @@ help: Makefile
 
 ##<goal>_: Same as 'cat ./install/<goal>.sh'
 %_:
-	@cat ./install/$*.sh
+	@cat ./install/$*

gen-makefile.sh

@@ -4,6 +4,7 @@ echo -e "# Autogenerated at $(date +'%d.%m.%Y %H:%M') using ${BASH_SOURCE[0]}\n"
 
 for file in ./packs/*; do
     cat ${file} >> Makefile
+    echo >> Makefile
 done;
 
 for file in ./install/*; do
@@ -22,12 +23,11 @@ help: Makefile
 	@echo "Available goals:"
 	@sed -n 's/^##//p' $< | column -t -s ':' |  sed -e "s/^/\t/"
 
-##<goal>_: Same as 'cat ./install/<goal>.sh'
+##<goal>_: Same as 'cat ./install/<goal>'
 %_:
-	@cat ./install/\$*.sh
+	@cat ./install/\$*
 EOF
 
-
 echo "New ./Makefile has been generated!"
 echo "Old one has been saved as ./Makefile.bak"
 echo

install/apache

@@ -7,6 +7,6 @@ echo "Installing apache2..."
 echo "==============================================="
 echo
 
-sudo apt install -y --autoremove apache2
-sudo service apache2 restart
-apache2 -v
+sudo apt install -y --autoremove apache2 && \
+    service apache2 restart && \
+    apache2 -v

install/apt

@@ -7,54 +7,56 @@ echo "Installing software from apt..."
 echo "==============================================="
 echo
 
-sudo apt update && sudo apt upgrade -y --autoremove
-sudo apt install -y --autoremove \
+sudo apt update && \
+    sudo apt upgrade -y --autoremove
+
+sudo apt install -y \
+    alien \
     apt-transport-https \
-    ca-certificates \
-    curl \
-    make \
-    cmake \
-    dialog \
     build-essential \
-    software-properties-common \
-    libaio1 \
-    libssl-dev \
-    libghc-zlib-dev \
-    libcurl4-gnutls-dev \
-    libexpat1-dev \
+    ca-certificates \
+    cmake \
+    curl \
+    dconf-editor \
+    default-jdk \
+    dialog \
     gettext \
     gnupg \
-    ubuntu-restricted-extras \
-    unzip \
-    mc \
-    htop \
-    nano \
-    neofetch \
-    default-jdk \
-    terminator \
-    dconf-editor \
-    alien \
-    meld \
-    vlc \
     gparted \
     hardinfo \
+    htop \
+    libaio1 \
+    libcurl4-gnutls-dev \
+    libexpat1-dev \
+    libghc-zlib-dev \
     libreoffice \
-    pulseeffects \
-    lsp-plugins \
+    libssl-dev \
     lsb-release \
+    lsp-plugins \
+    make \
+    mc \
+    meld \
+    nano \
+    neofetch \
     net-tools \
     nmap \
     p7zip-full \
-    sqlitebrowser
-    # gnome-software \
-    # minder \
-    # redshift \
-    # redshift-gtk \
-    # nodejs \
+    pulseeffects \
+    software-properties-common \
+    sqlitebrowser \
+    terminator \
+    ubuntu-restricted-extras \
+    unzip \
+    vlc \
+    # at \
     # compiz \
     # compizconfig-settings-manager \
+    # deepin-screenshot \
     # earlyoom \
     # etckeeper \
-    # deepin-screenshot \
     # geoclue-2.0 \
-    # at
+    # gnome-software \
+    # minder \
+    # nodejs \
+    # redshift \
+    # redshift-gtk