From 977329017684699f76387ec7aad8a814786252e8 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Jul 2024 09:48:56 +0000
Subject: [PATCH] make.sh: Refactor uploading sources

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/Config |  1 -
 make.sh    | 15 +++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lfs/Config b/lfs/Config
index 6711af997b..923fe00179 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -79,7 +79,6 @@ ZSTD_OPTIONS = \
 #
 URL_IPFIRE  = https://source.ipfire.org/source-2.x
 URL_TOOLCHAIN = https://source.ipfire.org/toolchains
-URL_SOURCE = people.ipfire.org:/pub/sources/source-2.x
 
 # Don't change this; it will be overridden by other makefiles where necessary.
 #
diff --git a/make.sh b/make.sh
index 8e7372b325..ca7433f480 100755
--- a/make.sh
+++ b/make.sh
@@ -2066,6 +2066,7 @@ readonly LOG_DIR="${BASEDIR}/log_${BUILD_ARCH}"
 readonly TOOLS_DIR="/tools_${BUILD_ARCH}"
 
 # Set URLs
+readonly SOURCE_URL="https://source.ipfire.org/ipfire-2.x"
 readonly TOOLCHAIN_URL="https://source.ipfire.org/toolchains"
 
 # Set the LOGFILE
@@ -2232,14 +2233,12 @@ gettoolchain)
 	download_toolchain "${TOOLCHAIN}"
 	;;
 uploadsrc)
-	if [ -z $IPFIRE_USER ]; then
-		echo -n "You have to setup IPFIRE_USER first. See .config for details."
-		print_status FAIL
-		exit 1
+	# Check if IPFIRE_USER is set
+	if [ -z "${IPFIRE_USER}" ]; then
+		exiterror "You have to setup IPFIRE_USER first. See .config for details."
 	fi
 
-	URL_SOURCE="$(awk '/^URL_SOURCE/ { print $3 }' lfs/Config)"
-
+	# Sync with upstream
 	rsync \
 		--recursive \
 		--update \
@@ -2247,8 +2246,8 @@ uploadsrc)
 		--progress \
 		--human-readable \
 		--exclude="toolchains/" \
-		"${BASEDIR}/cache/" \
-		"${IPFIRE_USER}@${URL_SOURCE}"
+		"${CACHE_DIR}/" \
+		"${IPFIRE_USER}@people.ipfire.org:/pub/sources/source-2.x"
 
 	exit 0
 	;;
-- 
2.47.3