053a620e22
'local result=$(cmd)' resets $? to 0 (the local builtin's own exit), so the
following checkSuccess always saw success regardless of cmd's real exit — the
mechanism that masked the de-sudo write failures. Split declaration from
assignment ('local result; result=$(cmd)') across all 235 active-code sites
(84 files) so the command's exit reaches checkSuccess. No behaviour change
beyond $? now being accurate (no set -e in runtime code; multi-line
assignments transform safely).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: librelad <librelad@digitalangels.vip>
50 lines
1.6 KiB
Bash
Executable File
50 lines
1.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
installDockerRootedCompose()
|
|
{
|
|
if [[ "$ISCOMP" == *"command not found"* ]]; then
|
|
isHeader "Install Docker-Compose"
|
|
|
|
# install docker-compose
|
|
((menu_number++))
|
|
echo ""
|
|
echo "---- $menu_number. Installing Docker-Compose..."
|
|
echo ""
|
|
echo ""
|
|
sleep 2s
|
|
|
|
######################################
|
|
### Install Debian / Ubuntu ###
|
|
######################################
|
|
|
|
if [[ "$OS_TYPE" == "Ubuntu" || "$OS_TYPE" == "Debian" ]]; then
|
|
local result; result=$(sudo curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m)" -o /usr/local/bin/docker-compose)
|
|
checkSuccess "Download the official Docker Compose script"
|
|
|
|
local result; result=$(sudo chmod +x /usr/local/bin/docker-compose)
|
|
checkSuccess "Make the script executable"
|
|
|
|
local result; result=$(docker compose --version)
|
|
checkSuccess "Verify the installation"
|
|
fi
|
|
|
|
######################################
|
|
### Install Arch Linux ###
|
|
######################################
|
|
|
|
if [[ "$OS_TYPE" == "Arch" ]]; then
|
|
pacman -Sy docker compose --noconfirm > $logs_dir/$docker_log_file 2>&1
|
|
fi
|
|
|
|
echo ""
|
|
|
|
echo " - Docker Compose Version is now: "
|
|
DOCKCOMPV=$(docker compose --version)
|
|
echo " "${DOCKCOMPV}
|
|
echo ""
|
|
echo ""
|
|
menu_number=0
|
|
sleep 1s
|
|
fi
|
|
}
|