summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-16 01:15:09 +0000
committerLyndon Brown <jnqnfe@gmail.com>2020-03-16 01:36:53 +0000
commit2cf397df668b1a2de2e2857f69e8f39bbf84f164 (patch)
treeb454931eac17a97a8b23e684eec59268f3e30273
parentb326c37f92f103b3cff9baf8f2f323cf484ae192 (diff)
downloadvyos-live-build-2cf397df668b1a2de2e2857f69e8f39bbf84f164.tar.gz
vyos-live-build-2cf397df668b1a2de2e2857f69e8f39bbf84f164.zip
installer: fix double slash in urls
-rwxr-xr-xscripts/build/installer_debian-installer8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 26aaf9abe..343c678ee 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -241,7 +241,7 @@ INITRD_GI="gtk/initrd.gz"
DESTDIR_GI="${DESTDIR}/gtk"
# Debian Installer daily builds
-DAILY_DI_URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
+DAILY_DI_URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily"
case "${LB_DERIVATIVE}" in
false)
@@ -252,7 +252,7 @@ case "${LB_DERIVATIVE}" in
URL="${DAILY_DI_URL}"
else
- URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+ URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
fi
;;
@@ -263,14 +263,14 @@ case "${LB_DERIVATIVE}" in
URL="${DAILY_DI_URL}"
else
- URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+ URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
fi
if [ "${LB_MODE}" = "progress-linux" ]
then
# FIXME: normal derivatives probably don't rebuild d-i,
# but progress-linux does.
- URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+ URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
fi
;;
esac