From f2d41885af2cfa753960346752ae33235e5cb4bf Mon Sep 17 00:00:00 2001
From: AnthonyAxenov <anthonyaxenov@gmail.com>
Date: Mon, 4 Jul 2022 23:24:27 +0800
Subject: [PATCH] Composer cleanup

---
 install/composer | 67 +++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 41 deletions(-)

diff --git a/install/composer b/install/composer
index d2cab8d..229a337 100755
--- a/install/composer
+++ b/install/composer
@@ -11,46 +11,31 @@ installed() {
     command -v "$1" >/dev/null 2>&1
 }
 
-if installed "php"; then
-    if installed "composer"; then
-        echo "WARNING: You already have composer installed - removing to install actual version"
-        sudo apt remove -y --autoremove composer
-        sudo rm -f /bin/composer
-        sudo rm -f /usr/bin/composer
-        sudo rm -f /usr/local/bin/composer
-        sudo rm -rf /usr/src/composer
-    fi
-    sudo mkdir -m 0777 -p /usr/src/composer
-    cd /usr/src/composer
-    # https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
-    EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
-    sudo php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-    ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
-    if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
-        >&2 echo 'ERROR: Invalid installer checksum'
-        rm composer-setup.php
-        exit 1
-    fi
-    php composer-setup.php --quiet
-    sudo cp /usr/src/composer/composer.phar /usr/local/bin/composer
-    cd - >/dev/null
-    sudo rm -rf /usr/src/composer/
-    installed "composer" && composer --version
-else
-    echo "WARNING: You need to have php installed"
+!installed "php" && echo "WARNING: You need to have php installed"
+
+if installed "composer"; then
+    echo "WARNING: Removing current composer to install its actual version"
+    sudo apt remove -y --autoremove composer
+    sudo rm -f /bin/composer
+    sudo rm -f /usr/bin/composer
+    sudo rm -f /usr/local/bin/composer
+    sudo rm -rf /usr/src/composer
 fi
 
-# title "Installing composer.phar in home dir..."
-# cd ~
-# EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)"
-# php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-# ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
-# if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
-# then
-#     >&2 echo 'ERROR: Invalid installer signature'
-#     rm composer-setup.php
-#     exit 1
-# fi
-# php composer-setup.php --quiet
-# RESULT=$?
-# rm composer-setup.php
+sudo mkdir -m 0777 -p /usr/src/composer
+cd /usr/src/composer
+
+# https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
+EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
+sudo php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
+    >&2 echo 'ERROR: Invalid installer checksum'
+    rm composer-setup.php
+    exit 1
+fi
+php composer-setup.php --quiet
+sudo cp /usr/src/composer/composer.phar /usr/local/bin/composer
+cd - >/dev/null
+sudo rm -rf /usr/src/composer/
+installed "composer" && composer --version