calamares-next: fix settings path, un-wonk yad ui

packages/calamares-branding-antergos-next/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=calamares-branding-antergos-next
 pkgver=1.0
-pkgrel=11
+pkgrel=12
 pkgdesc="Calamares branding for Antergos NeXT with offline/online installer support"
 arch=('any')
 url="https://github.com/Antergos-NeXT"

packages/calamares-branding-antergos-next/calamares-next.sh

@@ -133,15 +133,13 @@ InstallWithLogs() {
 }
 
 SetConfig() {
-    local cfolder=/etc/calamares
-
     case "$mode" in
         online)
-            sudo cp "$cfolder/settings_online.conf" "$cfolder/settings.conf"
+            sudo cp "/etc/calamares-online/settings.conf" "/etc/calamares/settings.conf"
             PreLog "Using online settings"
             ;;
         offline)
-            sudo cp "$cfolder/settings_offline.conf" "$cfolder/settings.conf"
+            sudo cp "/etc/calamares-offline/settings.conf" "/etc/calamares/settings.conf"
             PreLog "Using offline settings"
             ;;
     esac