From b458669754453b574dff56ed82d0f562f762bee6 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Mon, 3 Sep 2018 01:29:15 +0200
Subject: [PATCH] fix

---
 .gitignore                                                   | 1 +
 packages_libre-cli-openrc.txt => base_libre-xfce4-openrc.txt | 0
 make_mksquashfs-auto.sh                                      | 2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename packages_libre-cli-openrc.txt => base_libre-xfce4-openrc.txt (100%)

diff --git a/.gitignore b/.gitignore
index 19946b6..ebe619a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /out/
 /special/
 /work/
+/libre-xfce4-openrc/
 ArchLinuxARM-rpi-2-latest.tar.gz
 ArchLinuxARM-rpi-3-latest.tar.gz
 airootfs.sha512
diff --git a/packages_libre-cli-openrc.txt b/base_libre-xfce4-openrc.txt
similarity index 100%
rename from packages_libre-cli-openrc.txt
rename to base_libre-xfce4-openrc.txt
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index a8b591d..7523e98 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -62,7 +62,7 @@ EOT
         #pacman -U --noconfirm --force "https://www.parabola.nu/packages/libre/any/parabola-keyring/download"
         pacman -U --noconfirm --force "https://repomirror.parabola.nu/pool/parabola/parabola-keyring-20180802-1-any.pkg.tar.xz"
         #pacman -U --noconfirm --force "https://repomirror.parabola.nu/libre/os/x86_64/parabola-keyring-20180802-1-any.pkg.tar.xz"
-        ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
+        ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_${version}.txt)
     elif [ "${version%-*-*}" == "manjaro" ]; then
         cp pacman.conf_manjaro /etc/pacman.conf
         pacman -U --noconfirm --force "https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20180607-1-any.pkg.tar.xz"