Merge branch 'master' of git.axenov.dev:anthony/shell

install/lite-xl

@@ -1,43 +1,45 @@
 #!/usr/bin/env bash
-##makedesc: Install lite-xl
+##makedesc: Install lite-xl v2.1.7
 
 # https://github.com/lite-xl/lite-xl/releases
-# https://lite-xl.com/en/documentation/build
+# https://lite-xl.com/setup/getting-started/
 
 echo
 echo "==============================================="
-echo "Installing lite-xl v2.1.0..."
+echo "Installing lite-xl v2.1.7..."
 echo "==============================================="
 echo
 
-tar_url="https://github.com/lite-xl/lite-xl/releases/download/v2.1.0/lite-xl-v2.1.0-addons-linux-x86_64-portable.tar.gz"
-tar_filepath="/tmp/lite-xl.tar.gz"
+tar_url="https://github.com/lite-xl/lite-xl/releases/download/v2.1.7/lite-xl-v2.1.7-addons-linux-x86_64-portable.tar.gz"
+lpm_url="https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.x86_64-linux"
+tar_filepath="$HOME/install/lite-xl-v2.1.7.tar.gz"
 untar_dir="$HOME/install"
-untar_subdir="$untar_dir/lite-xl"
-dest_bin_dir="$HOME/.local/bin"
-dest_config_dir="$HOME/.config/lite-xl"
-dest_share_dir="$HOME/.local/share"
-dest_share_subdir="$dest_share_dir/lite-xl"
 
-wget "$tar_url" -O "$tar_filepath"
+rm -rf \
+    "$HOME/.local/bin/lpm" \
+    "$HOME/install/lite-xl" \
+    "$HOME/.local/bin/lite-xl" \
+    "$HOME/.local/share/lite-xl"
+
 mkdir -vp \
     "$untar_dir" \
-    #"$dest_config" \
-    "$dest_bin_dir" \
-    "$dest_share_dir"
+    "$HOME/.local/bin" \
+    "$HOME/.local/share/lite-xl"
 
-tar -xzf "$tar_filepath" -C "$untar_dir"
-mv -fv "$untar_subdir/lite-xl" "$dest_bin_dir/lite-xl"
-mv -fvT "$untar_subdir/data" "$dest_share_subdir"
-rm -fr "$tar_file" "$untar_subdir"
+wget "$tar_url" -O "$tar_filepath" && \
+    wget "$lpm_url" -O "$HOME/.local/bin/lpm" && \
+    chmod +x "$HOME/.local/bin/lpm" && \
+    tar -xzf "$tar_filepath" -C "$untar_dir" && \
+    cp -vf "$untar_dir/lite-xl/lite-xl" "$HOME/.local/bin/" && \
+    cp -vfr "$untar_dir"/lite-xl/data/* "$HOME/.local/share/lite-xl/"
 
 # echo -e "\nexport LITE_SCALE=1 # https://github.com/lite-xl/lite-xl/issues/1173\n" >> $HOME/.profile
-cat << EOF > "$dest_share_dir/applications/org.lite_xl.lite_xl.desktop"
+cat << EOF > "$HOME/.local/share/applications/org.lite_xl.lite_xl.desktop"
 [Desktop Entry]
 Type=Application
 Name=Lite XL
 Comment=A lightweight text editor written in Lua
-Exec=env LITE_SCALE=1 ${dest_bin_dir}/lite-xl %F
+Exec=$HOME/.local/bin/lite-xl %F
 Icon=lite-xl
 Terminal=false
 StartupWMClass=lite-xl
@@ -48,53 +50,6 @@ EOF
 sudo update-desktop-database && \
     xdg-desktop-menu forceupdate
 
-echo
-echo "==============================================="
-echo "Installing lite-xl plugins..."
-echo "https://github.com/lite-xl/lite-xl-plugins"
-echo "==============================================="
-echo
-
-download_plugin() {
-    echo "- $1"
-    curl -s "https://raw.githubusercontent.com/lite-xl/lite-xl-plugins/master/plugins/$1.lua" \
-        > "$dest_share_subdir/plugins/$1.lua"
-}
-
-download_plugin "align_carets"
-download_plugin "autosaveonfocuslost"
-download_plugin "bracketmatch"
-download_plugin "copyfilelocation"
-download_plugin "dragdropselected"
-download_plugin "fontconfig"
-download_plugin "force_syntax"
-download_plugin "lfautoinsert"
-download_plugin "markers"
-download_plugin "memoryusage"
-download_plugin "minimap"
-download_plugin "navigate"
-download_plugin "openselected"
-download_plugin "restoretabs"
-download_plugin "smoothcaret"
-
-# echo "- eofnewline-xl"
-# curl -s "https://raw.githubusercontent.com/bokunodev/lite_modules/master/plugins/eofnewline-xl.lua" \
-#     > "$dest_share_subdir/plugins/eofnewline-xl.lua"
-
-echo "- language_env"
-curl -s "https://raw.githubusercontent.com/anthonyaxenov/lite-xl-env-syntax/master/language_env.lua" \
-    > "$dest_share_subdir/plugins/language_env.lua"
-
-echo "- language_ignore"
-curl -s "https://raw.githubusercontent.com/anthonyaxenov/lite-xl-ignore-syntax/master/language_ignore.lua" \
-    > "$dest_share_subdir/plugins/language_ignore.lua"
-
-# echo "- language-containerfile"
-# git clone -q "https://github.com/FilBot3/lite-xl-language-containerfile.git" \
-#     "$dest_share_subdir/plugins/language_containerfile"
-
 echo
 echo "Finish!"
-echo "- $dest_bin_dir/lite-xl"
-echo "- $dest_share_subdir"
 echo

install/php

@@ -1,16 +1,16 @@
 #!/usr/bin/env bash
-##makedesc: Install php v8.3 + ppa
+##makedesc: Install php v8.4
 
-[ $1 ] && PHPVER="$1" || PHPVER="8.3"
+[ "$1" ] && PHPVER="$1" || PHPVER="8.4"
 echo
 echo "==============================================="
 echo "Installing php${PHPVER}..."
 echo "==============================================="
 echo
 
-sudo LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php
 sudo apt install -y --autoremove \
-    php${PHPVER} \
+    php${PHPVER}-fpm \
+    php${PHPVER}-dev \
     php${PHPVER}-apcu \
     php${PHPVER}-bcmath \
     php${PHPVER}-cli \
@@ -24,6 +24,7 @@ sudo apt install -y --autoremove \
     php${PHPVER}-mysql \
     php${PHPVER}-opcache \
     php${PHPVER}-pgsql \
+    php${PHPVER}-simplexml \
     php${PHPVER}-soap \
     php${PHPVER}-sqlite3 \
     php${PHPVER}-xdebug \

install/vivaldi

@@ -11,11 +11,9 @@ echo "Installing Vivaldi + ppa..."
 echo "==============================================="
 echo
 
-wget -qO- https://repo.vivaldi.com/archive/linux_signing_key.pub \
-| gpg --dearmor \
-| sudo dd of=/usr/share/keyrings/vivaldi-browser.gpg
-
-echo "deb [signed-by=/usr/share/keyrings/vivaldi-browser.gpg arch=$(dpkg --print-architecture)] https://repo.vivaldi.com/archive/deb/ stable main" \
-| sudo dd of=/etc/apt/sources.list.d/vivaldi-archive.list
+wget -qO- https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor > packages.vivaldi.gpg
+sudo install -o root -g root -m 644 packages.vivaldi.gpg /etc/apt/trusted.gpg.d
+sudo sh -c 'echo "deb [arch=amd64,armhf signed-by=/etc/apt/trusted.gpg.d/packages.vivaldi.gpg] https://repo.vivaldi.com/archive/deb stable main" > /etc/apt/sources.list.d/vivaldi.list'
+rm -f packages.vivaldi.gpg
 
 sudo apt update && sudo apt install vivaldi-stable

packs/phpstack

@@ -1,2 +1,2 @@
-##phptools: [PACK] Install only php tooling (composer, phpunit, psalm, phpcs, php-cs-fixer, php-spx, phpmd)
-phptools: composer php-psalm php-spx phpcs phpmd phpstan phpunit
+##phptools: [PACK] Install only php tooling (composer, phpunit, psalm, phpcs, php-cs-fixer, phpmd)
+phptools: composer php-psalm phpcs phpmd phpstan phpunit

tools/fix-repo-vivaldi.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# https://gist.github.com/pkorpine/16fcdbe070222cf1d99e67cf542e60c2
+
+sudo rm -rf /etc/apt/sources.list.d/vivaldi*
+cd /tmp
+wget -qO- https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor > packages.vivaldi.gpg
+sudo install -o root -g root -m 644 packages.vivaldi.gpg /etc/apt/trusted.gpg.d
+sudo sh -c 'echo "deb [arch=amd64,armhf signed-by=/etc/apt/trusted.gpg.d/packages.vivaldi.gpg] https://repo.vivaldi.com/archive/deb stable main" > /etc/apt/sources.list.d/vivaldi.list'
+rm -f packages.vivaldi.gpg
+sudo apt update

tools/fix-repo-vscode.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# https://code.visualstudio.com/docs/setup/linux
+
+sudo rm -rf /etc/apt/sources.list.d/vscode*
+cd /tmp
+sudo apt install wget gpg apt-transport-https
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
+sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
+echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" |sudo tee /etc/apt/sources.list.d/vscode.list > /dev/null
+rm -f packages.microsoft.gpg
+sudo apt update