wip

2024-11-24 21:13:37 +08:00
parent 7bb8a8c839
commit e2c0d1de87
65 changed files with 2306 additions and 437 deletions
--- a/install/apache2
+++ b/install/apache2
@@ -1,15 +1,11 @@
 #!/bin/bash
 ##makedesc: Install apache2 (latest)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

-sudo apt install -y --autoremove apache2 && \
-    sudo systemctl restart apache2
+apt_install apache2
+sudo systemctl restart apache2

-[ $? = 0 ] && {
-    echo
-    success "apache2 installed!"
-    apache2 -v
-    echo
-}
+success "apache2 installed!"
+apache2 -v
--- a/install/apt
+++ b/install/apt
@@ -1,8 +1,5 @@
 #!/bin/bash
 ##makedesc: Install software from apt
-source `dirname $0`/../helpers || exit 255
-
-title

 sudo apt update && \
    sudo apt upgrade -y --autoremove && \
@@ -27,7 +24,6 @@ sudo apt update && \
        libghc-zlib-dev \
        libssl-dev \
        lsb-release \
-        lsp-plugins \
        make \
        mc \
        meld \
@@ -36,7 +32,7 @@ sudo apt update && \
        net-tools \
        nmap \
        p7zip-full \
-        pulseeffects \
+        easyeffects \
        software-properties-common \
        terminator \
        ubuntu-restricted-extras \
@@ -51,9 +47,4 @@ sudo apt update && \
        tree \
        earlyoom
        # sqlitebrowser
-        # etckeeper \
-        # geoclue-2.0 \
-        # gnome-software \
-        # minder \
-        # redshift \
-        # redshift-gtk
+        # etckeeper
--- a/install/canon-mg2500
+++ b/install/canon-mg2500
@@ -1,17 +1,13 @@
 #!/bin/bash
 ##makedesc: Install Canon Pixma MG2500 + ppa
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

-sudo add-apt-repository -y ppa:thierry-f/fork-michael-gruz && \
-    sudo apt install -y \
-        cnijfilter-mg2500series \
-        scangearmp-mg2500series
+apt_ppa_add ppa:thierry-f/fork-michael-gruz

-[ $? = 0 ] && {
-    echo
-    success "Canon Pixma MG2500 installed!"
-    info "Now you must add a new printer in your system."
-    echo
-}
+apt_install cnijfilter-mg2500series
+apt_install scangearmp-mg2500series
+
+success "Drivers for Canon Pixma MG2500 installed!"
+info "Now you must reboot PC and connect your printer."
--- a/install/chrome
+++ b/install/chrome
@@ -1,20 +1,17 @@
 #!/bin/bash
 ##makedesc: Install google chrome (latest)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 # https://t.me/axenov_blog/251

 title

-mkdir -p "$HOME/install"
+mkdir -p "$HOME/install/deb"

 download "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" \
-    "$HOME/install/google-chrome.deb" && \
-    sudo dpkg -i "$HOME/install/google-chrome.deb"
+    "$HOME/install/deb/google-chrome.deb"

-[ $? = 0 ] && {
-    echo
-    success "Google Chrome installed!"
-    google-chrome --version
-    echo
-}
+dpkg_install "$HOME/install/deb/google-chrome.deb"
+
+success "Google Chrome installed!"
+google-chrome --version
--- a/install/composer
+++ b/install/composer
@@ -1,6 +1,7 @@
 #!/bin/bash
 ##makedesc: Install composer (latest)
-source `dirname $0`/../helpers || exit 255
+here=$( dirname $(readlink -e -- "${BASH_SOURCE}"))
+source "$here/../helpers.sh" || exit 255

 # https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md

@@ -8,34 +9,30 @@ title

 require php

-if installed "composer"; then
-    warn "WARNING: Removing current composer to install its actual version"
-    sudo apt remove -y --autoremove composer
-    sudo rm -f \
-        "$HOME/.local/bin/composer" \
-        /bin/composer \
-        /usr/bin/composer \
-        /usr/local/bin/composer \
-        /usr/src/composer \
-        "$HOME/.local/bin/composer"
+if installed composer; then
+    warn "WARNING: Removing current composer to install latest one"
+    composer --version
+    __AAA_NO_TITLE=1 source $here/../uninstall/composer
 fi

-mkdir -p "$HOME/install" "$HOME/.local/bin"
-download "https://getcomposer.org/installer" "$HOME/install/composer-setup.php" && \
-    php "$HOME/install/composer-setup.php" --install-dir="$HOME/.local/bin/composer"
+mkdir -p "$HOME/install/other" "$HOME/.local/bin"

-[ $? = 0 ] && {
-    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"
-    }
+download "https://getcomposer.org/installer" \
+    "$HOME/install/other/composer-setup.php"

-    echo
-    success "composer installed!"
-    composer --version
-    echo
+php "$HOME/install/other/composer-setup.php" \
+    --install-dir="$HOME/.local/bin/" \
+    --filename="composer"
+
+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"
+
+success "composer installed!"
+composer --version
+
--- a/install/docker
+++ b/install/docker
@@ -1,35 +1,39 @@
 #!/bin/bash
-##makedesc: Install docker (latest) + docker-compose (latest) + ppa
-source `dirname $0`/../helpers || exit 255
+##makedesc: Install docker (latest) + ppa
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 # https://docs.docker.com/engine/install/ubuntu/
+# https://docs.docker.com/engine/install/linux-postinstall/#manage-docker-as-a-non-root-user

 title

-require ca-certificates
-require curl
-require gnupg
-require lsb-release
+for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do
+    apt_remove $pkg
+done

-sudo mkdir -p /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg \
-| sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
-    sudo chmod a+r /etc/apt/keyrings/docker.gpg && \
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
-    | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null && \
-    sudo apt update && \
-    sudo apt install -y --autoremove \
-        docker-ce \
-        docker-ce-cli \
-        containerd.io \
-        docker-compose-plugin && \
-    sudo usermod -aG docker $(whoami)
+require ca-certificates lsb-release
+source /etc/os-release

-[ $? = 0 ] && {
-    echo
-    success "Docker installed!"
-    info "Probably, you need to relogin to apply 'docker' group."
-    info "Your ones currently are: $(groups)"
-    docker --version
-    echo
-}
+key="/etc/apt/keyrings/docker.asc"
+
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo cdownload https://download.docker.com/linux/ubuntu/gpg $key
+sudo chmod a+r $key
+
+echo "deb [arch=$(dpkg_arch) signed-by=$key] https://download.docker.com/linux/ubuntu $VERSION_CODENAME stable" \
+    | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+apt_update
+apt_install \
+    docker-ce \
+    docker-ce-cli \
+    containerd.io \
+    docker-buildx-plugin \
+    docker-compose-plugin
+
+sudo usermod -aG docker $(whoami)
+newgrp docker
+
+success "Docker installed!"
+docker --version
+info "Probably, you need to relogin to apply 'docker' group permanently."
--- a/install/dots
+++ b/install/dots
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install dotfiles
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

--- a/install/droidcam
+++ b/install/droidcam
@@ -1,22 +1,21 @@
 #!/bin/bash
 ##makedesc: Install droidcam v1.9.0
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

-# https://www.dev47apps.com/droidcam/linux/
+#TODO
+exit
+
+# https://droidcam.app/linux/

 title

-mkdir -p "$HOME/install/droidcam"
+mkdir -p "$HOME/install/deb/"

-download "https://files.dev47apps.net/linux/droidcam_1.9.0.zip" "$HOME/install/droidcam.zip" && \
-    unzip -oq "$HOME/install/droidcam.zip" -d "$HOME/install/droidcam" && \
-    cd "$HOME/install/droidcam" && \
-    sudo ./install-client
+download "https://beta.droidcam.app/go/droidCam.client.setup.deb" "$HOME/install/deb/droidcam_client_amd64.deb"

-[ $? = 0 ] && {
-    echo
-    success "droidcam installed!"
-    info "Don't forget to install the android app:"
-    info "https://play.google.com/store/apps/developer?id=Dev47Apps"
-    echo
-}
+dpkg_install "$HOME/install/deb/droidcam_client_amd64.deb"
+apt_install v4l2loopback-dkms
+
+success "droidcam installed!"
+info "Don't forget to install the android app:"
+info "https://play.google.com/store/apps/developer?id=Dev47Apps"
--- a/install/droidcam-obs
+++ b/install/droidcam-obs
@@ -1,11 +1,22 @@
 #!/bin/bash
 ##makedesc: Install droidcam-obs plugin v1.5.1

+#TODO
+# ffmpeg -version | head -n 1 | awk '{print $3}'
+# https://github.com/dev47apps/droidcam-obs-plugin/releases
+
+exit
+
+
+
 # https://www.dev47apps.com/droidcam/linux/
 # https://www.dev47apps.com/obs/
 # https://www.dev47apps.com/obs/usage.html
 # https://obsproject.com/forum/threads/how-to-start-virtual-camera-without-sudo-privileges.139783/

+
+
+
 echo
 echo "==============================================="
 echo "Installing droidcam-obs..."
--- a/install/flameshot
+++ b/install/flameshot
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install flameshot (latest)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

--- a/install/frkn
+++ b/install/frkn
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install Wireguard + FRKN
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 # https://frkn.org/ru/installation

--- a/install/git
+++ b/install/git
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install git (latest)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

--- a/install/golang
+++ b/install/golang
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install golang v1.21.0
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 # https://go.dev/dl/
 # https://golang.org/doc/install
--- a/install/grub-customizer
+++ b/install/grub-customizer
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install grub-customizer (latest + ppa)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

--- a/install/jbmono
+++ b/install/jbmono
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install JetBrains Mono fonts
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 # https://www.jetbrains.com/lp/mono/#how-to-install

--- a/install/kde-backports
+++ b/install/kde-backports
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install KDE Backports
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

--- a/install/omz-fancy
+++ b/install/omz-fancy
@@ -1,6 +1,15 @@
 #!/bin/bash
 ##makedesc: Install omz fancy (powerline10k + MesloLGS font)

+# https://gist.github.com/anthonyaxenov/b8460935d06b9f0da72def03d0f26515
+
+# Based on:
+# https://github.com/Powerlevel9k/powerlevel9k/wiki/Install-Instructions
+# https://github.com/ohmyzsh/ohmyzsh
+# https://powerline.readthedocs.io/en/latest/installation/linux.html#fonts-installation
+# https://gist.github.com/dogrocker/1efb8fd9427779c827058f873b94df95
+# https://linuxhint.com/install_zsh_shell_ubuntu_1804/
+
 echo
 echo "==============================================="
 echo "Installing omz fancy: powerline10k + MesloLGS font..."
--- a/install/openvpn
+++ b/install/openvpn
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install openvpn v2.6.3 (src)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 # https://openvpn.net/community-downloads/
 # https://openvpn.net/community-resources/installing-openvpn/
@@ -15,7 +15,7 @@ require libssl-dev \

 mkdir -p "$HOME/install/"
 download "https://swupdate.openvpn.org/community/releases/openvpn-${OVPNVER}.tar.gz" "$HOME/install/openvpn-${OVPNVER}.tar.gz" && \
-    unpak_targz "$HOME/install/openvpn-${OVPNVER}.tar.gz" "$HOME/install/" && \
+    unpack_targz "$HOME/install/openvpn-${OVPNVER}.tar.gz" "$HOME/install/" && \
    cd "$HOME/install/openvpn-${OVPNVER}" && \
    sudo ./configure && \
    sudo make && \
--- a/install/papirus
+++ b/install/papirus
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install papirus-icon-theme (latest)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

--- a/install/pgsql
+++ b/install/pgsql
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install postgresql (latest) and php-pgsql (if php is installed)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title

--- a/install/php
+++ b/install/php
@@ -1,7 +1,7 @@
 #!/bin/bash
-##makedesc: Install php v8.1 + ppa
+##makedesc: Install php v8.3 + ppa

-[ $1 ] && PHPVER="$1" || PHPVER="8.1"
+[ $1 ] && PHPVER="$1" || PHPVER="8.3"
 echo
 echo "==============================================="
 echo "Installing php${PHPVER}..."
--- a/install/postman
+++ b/install/postman
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install postman (latest)
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 # https://learning.postman.com/docs/getting-started/installation-and-updates/#installing-postman-on-linux

@@ -13,7 +13,7 @@ mkdir -p "$HOME/install" && \
    "$HOME/.local/share/applications"

 download "https://dl.pstmn.io/download/latest/linux64" "$HOME/install/postman.tar.gz" && \
-    unpak_targz "$HOME/install/postman.tar.gz" "$HOME/install" && \
+    unpack_targz "$HOME/install/postman.tar.gz" "$HOME/install" && \
    symlink "$HOME/install/Postman/Postman" "$HOME/.local/bin/postman" && \
    cat << EOF > "$HOME/.local/share/applications/Postman.desktop" && sudo update-desktop-database
 [Desktop Entry]
--- a/install/sublimetext
+++ b/install/sublimetext
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: Install Sublime Text
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 # https://www.sublimetext.com/download_thanks?target=x64-deb
 # https://gist.github.com/skoqaq/3f3e8f28e23c881143cef9cf49d821ff
--- a/install/vscode
+++ b/install/vscode
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##makedesc: VSCode deb-package
-source `dirname $0`/../helpers || exit 255
+source "$( dirname $(readlink -e -- "${BASH_SOURCE}"))/../helpers.sh" || exit 255

 title