Commit fd5d5c36 authored by Seblu's avatar Seblu
Browse files

Improve rsync errors handling 

Do not fail when rsync repositories; try to sync iso and update links, etc.

Also display error message when other rsync call return != 0
parent 7c936f49

archive.sh

+9 −3
Original line number Original line Diff line number Diff line
@@ -21,6 +21,10 @@ fail() { 
	exit 1

	exit 1

}

}





error() {

	printf "\e[31;1m==> ERROR: \e[;1m%s\e[m\n" "$*" >&2

}



msg() {

msg() {

	printf "\e[1;32m==> \e[;1m%s\e[m\n" "$*"

	printf "\e[1;32m==> \e[;1m%s\e[m\n" "$*"

}

}
@@ -65,7 +69,7 @@ repo_rsync() { 
	# rsync from master using last sync

	# rsync from master using last sync

	# we must use absolute path with --link-dest to avoid errors

	# we must use absolute path with --link-dest to avoid errors

	rsync  -rltH $LINKDEST --exclude '*/.*' --exclude 'iso/*' "$ARCHIVE_RSYNC" "$SNAP/" ||

	rsync  -rltH $LINKDEST --exclude '*/.*' --exclude 'iso/*' "$ARCHIVE_RSYNC" "$SNAP/" ||

		fail "Unable to rsync: $ARCHIVE_RSYNC"

		error "Unable to rsync: $ARCHIVE_RSYNC"





	# only to have a quick check of sync in listdir

	# only to have a quick check of sync in listdir

	touch "$SNAP"

	touch "$SNAP"
@@ -180,7 +184,8 @@ iso_rsync() { 
	[[ -d "$ISO_DIR" ]] || mkdir -p "$ISO_DIR"

	[[ -d "$ISO_DIR" ]] || mkdir -p "$ISO_DIR"





	# Rsync from master using last sync

	# Rsync from master using last sync

	rsync -vrltH "$ISO_RSYNC" --include='/????.??.??/***' --exclude='*' "$ISO_DIR/"

	rsync -vrltH "$ISO_RSYNC" --include='/????.??.??/***' --exclude='*' "$ISO_DIR/" ||

		error "Unable to rsync: $ISO_RSYNC"

}

}





# archive snapshot of aur tree

# archive snapshot of aur tree
@@ -207,7 +212,8 @@ aur_rsync() { 




	# Rsync from master using last sync

	# Rsync from master using last sync

	# We must use absolute path with --link-dest to avoid errors

	# We must use absolute path with --link-dest to avoid errors

	rsync  -rltH $LINKDEST --exclude '*/.*' "$AUR_RSYNC" "$SNAP/"

	rsync  -rltH $LINKDEST --exclude '*/.*' "$AUR_RSYNC" "$SNAP/" ||

		error "Unable to rsync: $AUR_RSYNC"





	# only to have a quick check of sync in listdir

	# only to have a quick check of sync in listdir

	touch "$SNAP"

	touch "$SNAP"