Skip to content

Commit efc5197

Browse files
committed
sdk-installer: do not try to pack *two* pacman.conf.proxy files
When the SDK installer is built from an SDK installed using the latest SDK installer, there is an /etc/pacman.conf.proxy left over from the installation process. Let's be more explicit in what we pack. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent fc3809d commit efc5197

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sdk-installer/release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ sed -e 's/^#\(XferCommand.*curl\).*/\1 --anyauth -C - -L -f %u >%o/' \
4949
</etc/pacman.conf >"$FAKEROOTDIR/etc/pacman.conf.proxy" ||
5050
die "Could not copy extra files into fake root"
5151

52-
fileList="$(cd / && echo \
53-
etc/pacman.* \
52+
fileList="etc/pacman.conf \
53+
etc/pacman.d \
5454
usr/bin/pacman.exe \
5555
usr/bin/curl.exe \
5656
usr/bin/gpg.exe \
@@ -59,7 +59,7 @@ fileList="$(cd / && echo \
5959
sort |
6060
uniq) \
6161
usr/ssl/certs/ca-bundle.crt \
62-
var/lib/pacman)
62+
var/lib/pacman
6363
$FAKEROOTDIR/setup-git-sdk.bat $FAKEROOTDIR/etc $FAKEROOTDIR/usr"
6464

6565
type 7za ||

0 commit comments

Comments
 (0)