From 021db1064e5ec26d03747970ab5aeaca4155d252 Mon Sep 17 00:00:00 2001
From: Anthony Axenov <anthonyaxenov@gmail.com>
Date: Wed, 19 Mar 2025 19:08:19 +0800
Subject: [PATCH] ubuntu tools misc

---
 tools/README.md                               | 15 +-----------
 .../desktop-upgrade.sh}                       | 24 ++++++-------------
 tools/{ubuntu-lemp.sh => ubuntu/lemp.sh}      |  0
 .../mediasrv.sh}                              |  0
 tools/{ubuntu-server.sh => ubuntu/server.sh}  |  0
 5 files changed, 8 insertions(+), 31 deletions(-)
 rename tools/{ubuntu-desktop-upgrade.sh => ubuntu/desktop-upgrade.sh} (59%)
 rename tools/{ubuntu-lemp.sh => ubuntu/lemp.sh} (100%)
 rename tools/{ubuntu-mediasrv.sh => ubuntu/mediasrv.sh} (100%)
 rename tools/{ubuntu-server.sh => ubuntu/server.sh} (100%)

diff --git a/tools/README.md b/tools/README.md
index 99dd29a..191e015 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -1,19 +1,6 @@
-# Shell scripts
-
-## Russian
+# Shell-скрипты
 
 Эти скрипты я писал в разное время для решения разных задач.
 Чтобы они не растерялись по репозиториям и носителям, я решил собрать их здесь в одну кучу.
 
 Я всегда использую Ubuntu в качестве своих настольных и серверных ОС, поэтому все эти скрипты писались и использовались в этих средах с версий 18.*.
-
-Многие скрипты зависимы от [io.sh](/io.sh).
-
-## English
-
-These scripts were written at different times to solve different my own problems.
-I decided to collect them here in a heap so that they are not lost in repositories and media.
-
-I always use Ubuntu as my desktop and server OS, so all these scripts has been written and used in these environments since version 18.*.
-
-Many scripts depending on [io.sh](/io.sh).
diff --git a/tools/ubuntu-desktop-upgrade.sh b/tools/ubuntu/desktop-upgrade.sh
similarity index 59%
rename from tools/ubuntu-desktop-upgrade.sh
rename to tools/ubuntu/desktop-upgrade.sh
index 489d2ad..6ecca79 100755
--- a/tools/ubuntu-desktop-upgrade.sh
+++ b/tools/ubuntu/desktop-upgrade.sh
@@ -2,23 +2,11 @@
 # https://dev.to/chefgs/upgrading-an-end-of-life-eol-ubuntu-os-to-lts-version-3a36
 # https://changelogs.ubuntu.com/meta-release
 
-installed() {
-    command -v "$1" >/dev/null 2>&1
-}
-
-# sudo software-properties-qt (переключиться с LTS на нормальные релизы)
-# sudo aptitude install update-manager-core update-manager
-# sudo apt upgrade --autoremove -y
-# installed pkcon && sudo pkcon update --autoremove -y
-# sudo apt dist-upgrade
-# sudo apt install update-manager-core
-# sudo do-release-upgrade -p
-
+# shellcheck disable=SC1091
 source /etc/os-release
 
 echo "Loading..."
-
-IFS=$'\n' codenames=($(curl -s https://changelogs.ubuntu.com/meta-release | grep -xP "^Dist:\s[\w]+$" | sed "s/Dist: //" ))
+mapfile -t codenames < <(curl -s https://changelogs.ubuntu.com/meta-release | grep -oP '(?<=Dist:\s).*')
 thisCodename="$VERSION_CODENAME"
 for idx in "${!codenames[@]}"; do
     if [ "${codenames[idx]}" = "$thisCodename" ]; then
@@ -26,7 +14,7 @@ for idx in "${!codenames[@]}"; do
     fi
 done
 
-targetDownloadPath="`pwd`/upgrade-$nextCodename"
+targetDownloadPath="$(pwd)/upgrade-$nextCodename"
 targetToolPath="$targetDownloadPath/unpacked"
 targetToolFile="$targetDownloadPath/$nextCodename.tar.gz"
 
@@ -38,12 +26,14 @@ rm -rf "$targetToolPath"
 mkdir -p "$targetToolPath"
 
 echo "Downloading..."
-cd "$targetDownloadPath"
+cd "$targetDownloadPath" || exit 1
 wget "http://archive.ubuntu.com/ubuntu/dists/${nextCodename}-updates/main/dist-upgrader-all/current/${nextCodename}.tar.gz"
 
 echo "Unpacking..."
 tar -xaf "$targetToolFile" -C "$targetToolPath"
 
 echo "Starting..."
-cd unpacked
+cd ./unpacked || exit 1
+
+# shellcheck disable=SC2086
 sudo ./$nextCodename
diff --git a/tools/ubuntu-lemp.sh b/tools/ubuntu/lemp.sh
similarity index 100%
rename from tools/ubuntu-lemp.sh
rename to tools/ubuntu/lemp.sh
diff --git a/tools/ubuntu-mediasrv.sh b/tools/ubuntu/mediasrv.sh
similarity index 100%
rename from tools/ubuntu-mediasrv.sh
rename to tools/ubuntu/mediasrv.sh
diff --git a/tools/ubuntu-server.sh b/tools/ubuntu/server.sh
similarity index 100%
rename from tools/ubuntu-server.sh
rename to tools/ubuntu/server.sh