1 files changed, 19 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d38d0dca9f50..dde04997a3df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,35 @@
 # Maintainer: Mauricio de Lima <emauricio@uai21.com>
-pkgname=calamares-config
-_destname1="/etc"
-pkgver=71
+pkgname=archiso-calamares-config
+pkgver=72
 pkgrel=1
 pkgdesc="Calamares for Archiso"
 arch=('any')
-url="https://github.com/UaiSO21"
+url="https://gitlab.com/uaiso/labs/uarchiso"
 license=('GPL3')
 makedepends=('git')
-#depends=('')
 provides=("${pkgname}")
 options=(!strip !emptydirs)
 source=(${pkgname}::"git+${url}/${pkgname}")
 sha256sums=('SKIP')
+
 if [ -e "${pkgname}.install" ];then
     install=${pkgname}.install
 fi
+
 package() {
-	install -dm755 ${pkgdir}${_destname1}
-	cp -r ${srcdir}/${pkgname}${_destname1}/* ${pkgdir}${_destname1}
-}
 
+    InternalDir="${srcdir}/${pkgname}"
 
+    # Copy files
+    if [ -d "${InternalDir}/usr" ]; then
+        cp -r "${InternalDir}/usr" "${pkgdir}/"
+    fi
+
+    if [ -d "${InternalDir}/etc" ]; then
+        cp -r "${InternalDir}/etc" "${pkgdir}/"
+    fi
+
+    if [ -d "${InternalDir}/opt" ]; then
+        cp -r "${InternalDir}/opt" "${pkgdir}/"
+    fi
+}