rustdesk fix

install/composer

@@ -25,8 +25,8 @@ if installed "composer"; then
     rm $HOME/.local/bin/composer
 fi
 
-mkdir -p $HOME/install && cd $HOME/install
-# mkdir -p $HOME/.local/bin
+mkdir -p $HOME/install $HOME/.local/bin
+cd $HOME/install
 
 EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
 # php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
@@ -41,12 +41,13 @@ php composer-setup.php --quiet
 mv -f $HOME/install/composer.phar $HOME/.local/bin/composer
 cd - >/dev/null
 
-COMPOSER_GLOBAL_HOME="$(composer config -g home)"
+COMPOSER_GLOBAL_HOME="$($HOME/.local/bin/composer config -g home)"
 NEWPATH="export PATH=\"$COMPOSER_GLOBAL_HOME/vendor/bin:\${PATH}\""
 cat "${HOME}/.profile" | grep -qoh "$NEWPATH" || {
     $NEWPATH
     echo "$NEWPATH" >> "${HOME}/.profile"
 }
+source "${HOME}/.profile"
 
 echo
 echo "Finish!"

install/php

@@ -16,12 +16,10 @@ sudo apt install -y --autoremove \
     php${PHPVER}-cli \
     php${PHPVER}-common \
     php${PHPVER}-curl \
-    # php${PHPVER}-dba \
     php${PHPVER}-dev \
     php${PHPVER}-dom \
     php${PHPVER}-gd \
     php${PHPVER}-intl \
-    # php${PHPVER}-ldap \
     php${PHPVER}-mbstring \
     php${PHPVER}-mysql \
     php${PHPVER}-opcache \
@@ -31,7 +29,10 @@ sudo apt install -y --autoremove \
     php${PHPVER}-xdebug \
     php${PHPVER}-xml \
     php${PHPVER}-xmlrpc \
-    # php${PHPVER}-xsl \
     php${PHPVER}-zip
 
+    # php${PHPVER}-ldap \
+    # php${PHPVER}-dba \
+    # php${PHPVER}-xsl \
+
 php -v

install/php-psalm

@@ -20,6 +20,7 @@ cat "${HOME}/.profile" | grep -qoh "$NEWPATH" || {
     $NEWPATH
     echo "$NEWPATH" >> "${HOME}/.profile"
 }
+source "${HOME}/.profile"
 
 composer global require vimeo/psalm --dev
 

install/phpcs

@@ -20,6 +20,7 @@ cat "${HOME}/.profile" | grep -qoh "$NEWPATH" || {
     $NEWPATH
     echo "$NEWPATH" >> "${HOME}/.profile"
 }
+source "${HOME}/.profile"
 
 composer global require squizlabs/php_codesniffer --dev
 composer global require friendsofphp/php-cs-fixer --dev

install/phpmd

@@ -20,6 +20,7 @@ cat "${HOME}/.profile" | grep -qoh "$NEWPATH" || {
     $NEWPATH
     echo "$NEWPATH" >> "${HOME}/.profile"
 }
+source "${HOME}/.profile"
 
 composer global require phpmd/phpmd --dev
 

install/phpstan

@@ -20,6 +20,7 @@ cat "${HOME}/.profile" | grep -qoh "$NEWPATH" || {
     $NEWPATH
     echo "$NEWPATH" >> "${HOME}/.profile"
 }
+source "${HOME}/.profile"
 
 composer global require phpstan/phpstan --dev
 

install/phpunit

@@ -12,7 +12,7 @@ installed() {
 }
 
 ! installed 'php' && echo 'ERROR: You need php to be installed' && exit 1
-! installed "composer" && echo "ERROR: You need composer to be installed" && exit 2
+! installed "composer" && echo "ERROR: You rneed composer to be installed" && exit 2
 
 COMPOSER_GLOBAL_HOME="$(composer config -g home)"
 NEWPATH="export PATH=\"$COMPOSER_GLOBAL_HOME/vendor/bin:\${PATH}\""
@@ -20,6 +20,7 @@ cat "${HOME}/.profile" | grep -qoh "$NEWPATH" || {
     $NEWPATH
     echo "$NEWPATH" >> "${HOME}/.profile"
 }
+source "${HOME}/.profile"
 
 composer global require phpunit/phpunit --dev
 

install/rustdesk

@@ -4,17 +4,17 @@
 [ $1 ] && RDVER="$1" || RDVER="1.1.9"
 echo
 echo "==============================================="
-echo "Installing rustdesk v${RDVER}..."
+echo "Installing rustdesk v$RDVER..."
 echo "==============================================="
 echo
 
 # https://github.com/rustdesk/rustdesk
 
-deb_path="${HOME}/install"
-deb_name="rustdesk_${RDVER}.deb"
+deb_path="$HOME/install"
+deb_name="rustdesk-$RDVER.deb"
 mkdir -p $deb_path
 deb="$deb_path/$deb_name"
 
-sudo apt install libxdo3 python3-pip && \
-    wget "http://github.com/rustdesk/rustdesk/releases/download/${RDVER}/$deb_name" -O $deb && \
+sudo apt install -y libxdo3 python3-pip && \
+    wget "https://github.com/rustdesk/rustdesk/releases/download/$RDVER/$deb_name" -O $deb && \
     sudo dpkg -i $deb