Skip to content

Wait for DBUS_SESSION_BUS_ADDRESS to be set and remove the duplicate request for the destination #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sc74 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Wait for DBUS_SESSION_BUS_ADDRESS to be set and remove the duplicate request for the destination #257

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6f3968
Check the permissions for mkdir
sc74 May 9, 2026
1e53adb
Set LC_ALL=C
sc74 May 10, 2026
4d57a0e
Merge branch 'devDucks:main' into backup
sc74 May 15, 2026
e79263c
Wait until DBUS_SESSION_BUS_ADDRESS is set
sc74 May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 43 additions & 25 deletions scripts/backup-astroarch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ask_valid_dest() {
done
}

# --- NEW CLEANING FEATURE ---
# --- CLEANING FEATURE ---
cleanup_canceled_backup() {
local DEST="$1"
# Deletes the corrupted folder (requires sudo because rsync preserves root permissions)
Expand Down Expand Up @@ -97,16 +97,9 @@ if [ ! -f "$CONFIG_FILE" ]; then
<p>Please note: if you cancel the backup while it is in progress, the backup folder and the configuration file will be deleted</p>
<p><b>The backup will take some time...</b></p>
</html>" 600 500

DEST_PATH=$(kdialog --inputbox "First backup. Choose storage location:" "$DEFAULT_DEST")
else
read -p "First installation. Location [$DEFAULT_DEST]: " DEST_PATH
fi
if [[ "$DEST_PATH" != */backup ]]; then
DEST_PATH="${DEST_PATH%/}/backup"
fi
[ -z "$DEST_PATH" ] && DEST_PATH="$DEFAULT_DEST"

# ask_valid_dest handles everything: prompt, validation, mkdir
ask_valid_dest "First backup. Choose storage location:" "$DEFAULT_DEST"
FIRST_BACKUP="yes"
AUTO_CHOICE="Ask"
Expand Down Expand Up @@ -220,23 +213,48 @@ fi

# --- 5. EXECUTION ---
if is_gui; then
dbus_ref=$(kdialog --progressbar "Initializing backup..." 100)
sudo -n rsync -aAXHxh --delete --no-inc-recursive --info=progress2 "${EXCLUSIONS[@]}" / "$ABS_DEST" 2>/dev/null | \
stdbuf -oL tr '\r' '\n' | grep --line-buffered -oP '[0-9]+(?=%)' | \
while read -r percent; do
((count++))
if (( count % 5 == 0 )); then
# IF CANCELED BY THE USER
if ! qdbus6 $dbus_ref >/dev/null 2>&1; then
sudo pkill -f "rsync.*$ABS_DEST"
cleanup_canceled_backup "$ABS_DEST"
fi
qdbus6 $dbus_ref setLabelText "Copying: $percent% of $TRANS_HUMAN"
qdbus6 $dbus_ref Set "" value "$percent"
fi

# --- D-Bus session detection ---
# If DBUS_SESSION_BUS_ADDRESS is not set (e.g. launched from Calamares at session start
# before the bus is ready), build the standard systemd socket path for user astronaut.
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
USER_ID=$(id -u astronaut 2>/dev/null || id -u)
export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/${USER_ID}/bus"
fi

# Wait until the D-Bus socket is actually available (max 30s).
# This handles the race condition where Calamares autostart launches
# before the KDE session bus is fully initialised.
DBUS_SOCKET=$(echo "$DBUS_SESSION_BUS_ADDRESS" | sed 's|unix:path=||')
WAIT=0
while [ ! -S "$DBUS_SOCKET" ] && [ "$WAIT" -lt 30 ]; do
sleep 1
((WAIT++))
done
qdbus6 $dbus_ref close 2>/dev/null
notify-send --app-name 'AstroArch' --icon="/home/astronaut/.astroarch/assets/icons/novnc-icon.svg" -t 10000 "✅ Backup completed."

if [ ! -S "$DBUS_SOCKET" ]; then
# Fallback: D-Bus still not available after 30s → run in terminal mode
echo "⚠️ D-Bus session bus not available after 30s. Falling back to terminal mode."
sudo -n rsync -aAXHxh --delete --no-inc-recursive --info=progress2 "${EXCLUSIONS[@]}" / "$ABS_DEST"
else
dbus_ref=$(kdialog --progressbar "Initializing backup..." 100)
sudo -n rsync -aAXHxh --delete --no-inc-recursive --info=progress2 "${EXCLUSIONS[@]}" / "$ABS_DEST" 2>/dev/null | \
stdbuf -oL tr '\r' '\n' | grep --line-buffered -oP '[0-9]+(?=%)' | \
while read -r percent; do
((count++))
if (( count % 5 == 0 )); then
# IF CANCELED BY THE USER
if ! qdbus6 $dbus_ref >/dev/null 2>&1; then
sudo pkill -f "rsync.*$ABS_DEST"
cleanup_canceled_backup "$ABS_DEST"
fi
qdbus6 $dbus_ref setLabelText "Copying: $percent% of $TRANS_HUMAN"
qdbus6 $dbus_ref Set "" value "$percent"
fi
done
qdbus6 $dbus_ref close 2>/dev/null
notify-send --app-name 'AstroArch' --icon="/home/astronaut/.astroarch/assets/icons/novnc-icon.svg" -t 10000 "✅ Backup completed."
fi
else
sudo -n rsync -aAXHxh --delete --no-inc-recursive --info=progress2 "${EXCLUSIONS[@]}" / "$ABS_DEST"
fi
Expand Down