From b80b239ecd544fde2998795b7d18e67fff26dd9e Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 23 Jun 2018 14:32:06 +0200
Subject: [PATCH] revert wrong url syntax

---
 usr/lib/initcpio/install/arch_core_install | 4 ++--
 usr/share/archboot/installer/quickinst     | 2 +-
 usr/share/archboot/installer/setup         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/lib/initcpio/install/arch_core_install b/usr/lib/initcpio/install/arch_core_install
index 7f8deec95..0a3286ac7 100644
--- a/usr/lib/initcpio/install/arch_core_install
+++ b/usr/lib/initcpio/install/arch_core_install
@@ -67,7 +67,7 @@ build ()
     PACKAGES=$(for i in ${SEARCHSVN};do ! [ "$(echo $i | awk -F/ '{print $3}')" = "" ] && (. $i/PKGBUILD; echo ${pkgname[@]});unset pkgname;done)
     pacman -Sy
         SIGNATURES=""
-    for i in $(pacman -Sp ${PACKAGES}); do
+    for i in $(pacman --cachedir / -Sp ${PACKAGES}); do
         SIGNATURES="${SIGNATURES} ${i}.sig"
     done
     wget -N --directory-prefix /var/cache/pacman/pkg/ ${SIGNATURES}
@@ -122,7 +122,7 @@ build ()
     # set LANG to US we parse language output here
     LANG=US
     for i in refind-efi; do
-        wget -N --directory-prefix /var/cache/pacman/pkg/ $(pacman -Sp $i).sig
+        wget -N --directory-prefix /var/cache/pacman/pkg/ $(pacman --cachedir / -Sp $i).sig
         pacman -Sw --noconfirm $i
 
         pkgver="$(echo $(pacman -Si $i | grep -m 1 Version | cut -d ":" -f 2,3))"
diff --git a/usr/share/archboot/installer/quickinst b/usr/share/archboot/installer/quickinst
index a4e3d5ba6..c86fc7a03 100755
--- a/usr/share/archboot/installer/quickinst
+++ b/usr/share/archboot/installer/quickinst
@@ -42,7 +42,7 @@ usage() {
 # creates temporary pacman.conf file
 pacman_conf() {
     if [[ "${MODE}" = "media" ]]; then
-        serverurl="file:///${PKGARG}"
+        serverurl="file://${PKGARG}"
     elif [[ "${MODE}" = "net" ]]; then
         serverurl="${PKGARG}"
     fi
diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index c413930b0..08820049a 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -28,7 +28,7 @@ PACMAN="pacman --root ${DESTDIR} --config /tmp/pacman.conf --noconfirm --noprogr
 DLPROG="wget"
 # sources
 SYNC_URL=""
-FILE_URL="file:////packages/core-$(uname -m)/pkg"
+FILE_URL="file:///packages/core-$(uname -m)/pkg"
 MIRRORLIST="/etc/pacman.d/mirrorlist"
 unset PACKAGES