Корректировка syncthing

install/010-git.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
+echo
-title "Installing git..."
+echo "==============================================="
+echo "Installing git..."
+echo "==============================================="
+echo
 
-if installed 'git'; then
+if installed git; then
     [ ! -d "/usr/src/git" ] && sudo git clone https://github.com/git/git.git --depth=1 /usr/src/git
     sudo chown -R anthony: /usr/src/git
     cd /usr/src/git/
-    # sudo git pull
     sudo make prefix=/usr/local all
     sudo make prefix=/usr/local install
 else
@@ -21,4 +23,4 @@ else
     sudo git clone https://github.com/git/git.git --depth=1 /usr/src/git
     sudo chown -R anthony: /usr/src/git
 fi
-success "$(git --version)"
+git --version

install/020-docker.sh

@@ -1,21 +1,24 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
+echo
-title "Installing docker..."
+echo "==============================================="
+echo "Installing docker..."
+echo "==============================================="
+echo
 
 # https://docs.docker.com/engine/install/ubuntu/
 
 # curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 # sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable"
 # sudo apt update
-# apti docker-ce docker-compose
+# sudo apt install -y --autoremove docker-ce docker-compose
 
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
 echo \
   "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.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
-apti docker-ce docker-ce-cli containerd.io
+sudo apt install -y --autoremove docker-ce docker-ce-cli containerd.io
 
 sudo usermod -aG docker anthony
 
-success "You need to logout and log in again to apply docker group"
+echo "You need to logout and log in again to apply docker group"

install/040-ulauncher.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
+echo
-title "Installing ulauncher from apt..."
+echo "==============================================="
+echo "Installing ulauncher..."
+echo "==============================================="
+echo
 
 sudo add-apt-repository ppa:agornostal/ulauncher
-apti ulauncher
+sudo apt install -y --autoremove ulauncher

install/050-syncthing.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
-. "../src/01-common.sh" || exit 5
+echo
-title "Installing syncthing..."
+echo "==============================================="
+echo "Installing syncthing..."
+echo "==============================================="
+echo
 
 # https://apt.syncthing.net/
 
@@ -14,8 +17,8 @@ echo "deb [signed-by=/usr/share/keyrings/syncthing-archive-keyring.gpg] https://
 echo "deb [signed-by=/usr/share/keyrings/syncthing-archive-keyring.gpg] https://apt.syncthing.net/ syncthing candidate" | sudo tee /etc/apt/sources.list.d/syncthing.list
 
 # Update and install syncthing:
-aptu
+sudo apt update
-apti syncthing
+sudo apt install -y --autoremove syncthing
 
 wget "https://raw.githubusercontent.com/syncthing/syncthing/main/etc/linux-desktop/syncthing-start.desktop" -O /home/anthony/.local/share/applications/syncthing-start.desktop
 wget "https://raw.githubusercontent.com/syncthing/syncthing/main/etc/linux-desktop/syncthing-ui.desktop" -O /home/anthony/.local/share/applications/syncthing-ui.desktop