From bd43b62aa45682d81fcb7ef6fcc34e889ff9ba9e Mon Sep 17 00:00:00 2001
From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Date: Sun, 11 Oct 2015 21:36:42 +0200
Subject: [PATCH] repo_packages: read package list from offline_repo.json
---
scripts/repo_packages.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/repo_packages.sh b/scripts/repo_packages.sh
index 541cb52..9b06b9a 100755
--- a/scripts/repo_packages.sh
+++ b/scripts/repo_packages.sh
@@ -40,7 +40,8 @@ if [ ! -d "$SCRIPT_DIR" ]; then
exit 2
fi
-PKG_LIST=$(get_packages_from_file "$CONTRIB_DIR/offline_repo_packages")
+#all packages that do not have an urls field (and thus, should be resolved using apt)
+PKG_LIST=$("$SCRIPT_DIR/read_packages.py" "$CONTRIB_DIR/offline_repo.json" | grep -E "^[^[:space:]]+$" | tr "\n" " ")
PKG_DESTINATION=$DESTINATION/archives
@@ -61,7 +62,7 @@ PKG_URLS=$(apt-get install --reinstall --print-uris -qq $PKG_LIST | cut -d"'" -f
echo "package urls:"
echo "$PKG_URLS"
-PKG_URLS="$PKG_URLS $(get_packages_from_file "$CONTRIB_DIR/offline_repo_packages.manualurls")"
+PKG_URLS="$PKG_URLS $("$SCRIPT_DIR/read_packages.py" "$CONTRIB_DIR/offline_repo.json" | cut -f2- -s -d" " | tr "\n" " ")"
echo "downloading archives. this may take some time..."
wget -nc -P $PKG_DESTINATION $PKG_URLS
--
GitLab