From 09aa879071a6a3d9cc25a6271dfd8a1819dc99df Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Mon, 23 Nov 2015 23:22:58 +0100
Subject: [PATCH] buildsets: use linux conf dir standards

---
 Makefile                                  | 22 +++++++++++-----------
 lib/util.sh                               |  4 ++--
 sets/{iso => iso.d}/community-minimal.set |  0
 sets/{iso => iso.d}/community.set         |  0
 sets/{iso => iso.d}/default.set           |  0
 sets/{iso => iso.d}/official.set          |  0
 sets/{pkg => pkg.d}/default.set           |  0
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename sets/{iso => iso.d}/community-minimal.set (100%)
 rename sets/{iso => iso.d}/community.set (100%)
 rename sets/{iso => iso.d}/default.set (100%)
 rename sets/{iso => iso.d}/official.set (100%)
 rename sets/{pkg => pkg.d}/default.set (100%)

diff --git a/Makefile b/Makefile
index 6fb5d51..9cf1c46 100644
--- a/Makefile
+++ b/Makefile
@@ -31,13 +31,13 @@ SYSCONF = \
 	conf/manjaro-tools.conf
 
 SETS_PKG = \
-	sets/pkg/default.set
+	sets/pkg.d/default.set
 
 SETS_ISO = \
-	sets/iso/default.set \
-	sets/iso/official.set \
-	sets/iso/community.set \
-	sets/iso/community-minimal.set
+	sets/iso.d/default.set \
+	sets/iso.d/official.set \
+	sets/iso.d/community.set \
+	sets/iso.d/community-minimal.set
 
 SHARED = \
 	conf/pacman-default.conf \
@@ -148,8 +148,8 @@ install_base:
 
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg
-	install -m0644 ${SETS_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg.d
+	install -m0644 ${SETS_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg.d
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
@@ -168,8 +168,8 @@ install_pkg:
 
 
 install_iso:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso
-	install -m0644 ${SETS_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso.d
+	install -m0644 ${SETS_ISO} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso.d
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
@@ -209,7 +209,7 @@ uninstall_base:
 
 
 uninstall_pkg:
-	for f in ${SETS_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg/$$f; done
+	for f in ${SETS_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/pkg.d/$$f; done
 	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
@@ -219,7 +219,7 @@ uninstall_pkg:
 
 
 uninstall_iso:
-	for f in ${SETS_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso/$$f; done
+	for f in ${SETS_ISO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/sets/iso.d/$$f; done
 	for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
 	for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
diff --git a/lib/util.sh b/lib/util.sh
index 6d5301b..231c758 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -390,7 +390,7 @@ init_buildtree(){
 init_buildpkg(){
 	chroots_pkg="${chroots_dir}/buildpkg"
 
-	sets_dir_pkg="${sets_dir}/pkg"
+	sets_dir_pkg="${sets_dir}/pkg.d"
 
 	prepare_dir "${sets_dir_pkg}"
 
@@ -400,7 +400,7 @@ init_buildpkg(){
 init_buildiso(){
 	chroots_iso="${chroots_dir}/buildiso"
 
-	sets_dir_iso="${sets_dir}/iso"
+	sets_dir_iso="${sets_dir}/iso.d"
 
 	prepare_dir "${sets_dir_iso}"
 
diff --git a/sets/iso/community-minimal.set b/sets/iso.d/community-minimal.set
similarity index 100%
rename from sets/iso/community-minimal.set
rename to sets/iso.d/community-minimal.set
diff --git a/sets/iso/community.set b/sets/iso.d/community.set
similarity index 100%
rename from sets/iso/community.set
rename to sets/iso.d/community.set
diff --git a/sets/iso/default.set b/sets/iso.d/default.set
similarity index 100%
rename from sets/iso/default.set
rename to sets/iso.d/default.set
diff --git a/sets/iso/official.set b/sets/iso.d/official.set
similarity index 100%
rename from sets/iso/official.set
rename to sets/iso.d/official.set
diff --git a/sets/pkg/default.set b/sets/pkg.d/default.set
similarity index 100%
rename from sets/pkg/default.set
rename to sets/pkg.d/default.set