From 4a184e88bfdabee9e2831036766abf279f38d299 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sat, 28 Jul 2018 15:07:41 -0500
Subject: [PATCH] Mainly just moved configs to new CONFIG directory format

---
 {SRC/snap-base => CONFIG/etc}/bashrc       |  0
 SNAP/ids.default => CONFIG/etc/default/ids |  0
 {SRC/snap-base => CONFIG/etc}/group        |  0
 {SRC/snap-base => CONFIG/etc}/passwd       |  0
 {SRC/snap-base => CONFIG/etc}/profile      |  0
 {SRC/snap-base => CONFIG/etc}/snap.conf    |  0
 {SRC/snap-base => CONFIG/etc}/snap_version |  0
 Makefile                                   |  5 +++--
 SNAP/usher                                 | 20 --------------------
 SRC/snap-base/Makefile                     | 12 +-----------
 10 files changed, 4 insertions(+), 33 deletions(-)
 rename {SRC/snap-base => CONFIG/etc}/bashrc (100%)
 rename SNAP/ids.default => CONFIG/etc/default/ids (100%)
 rename {SRC/snap-base => CONFIG/etc}/group (100%)
 rename {SRC/snap-base => CONFIG/etc}/passwd (100%)
 rename {SRC/snap-base => CONFIG/etc}/profile (100%)
 rename {SRC/snap-base => CONFIG/etc}/snap.conf (100%)
 rename {SRC/snap-base => CONFIG/etc}/snap_version (100%)

diff --git a/SRC/snap-base/bashrc b/CONFIG/etc/bashrc
similarity index 100%
rename from SRC/snap-base/bashrc
rename to CONFIG/etc/bashrc
diff --git a/SNAP/ids.default b/CONFIG/etc/default/ids
similarity index 100%
rename from SNAP/ids.default
rename to CONFIG/etc/default/ids
diff --git a/SRC/snap-base/group b/CONFIG/etc/group
similarity index 100%
rename from SRC/snap-base/group
rename to CONFIG/etc/group
diff --git a/SRC/snap-base/passwd b/CONFIG/etc/passwd
similarity index 100%
rename from SRC/snap-base/passwd
rename to CONFIG/etc/passwd
diff --git a/SRC/snap-base/profile b/CONFIG/etc/profile
similarity index 100%
rename from SRC/snap-base/profile
rename to CONFIG/etc/profile
diff --git a/SRC/snap-base/snap.conf b/CONFIG/etc/snap.conf
similarity index 100%
rename from SRC/snap-base/snap.conf
rename to CONFIG/etc/snap.conf
diff --git a/SRC/snap-base/snap_version b/CONFIG/etc/snap_version
similarity index 100%
rename from SRC/snap-base/snap_version
rename to CONFIG/etc/snap_version
diff --git a/Makefile b/Makefile
index 67263a6..666ed44 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ DESC = Base system directories and files
 ARCHIVE := 
 SRCDIR := $(PWD)/SRC/snap-base
 PATCHDIR := $(PWD)/SRC/patches
-VERSION := 0.0alpha1-7
+VERSION := 0.0alpha1-8
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -35,4 +35,5 @@ clean:
 	@rm -rvf $(ROOT) \
 		$(SNAPINFO) \
 		$(MANIFEST) \
-		$(FILES)
+		$(FILES) \
+		$(CONFIG)
diff --git a/SNAP/usher b/SNAP/usher
index a1703b3..2f2d5ca 100755
--- a/SNAP/usher
+++ b/SNAP/usher
@@ -7,26 +7,6 @@ case $1 in
     exit 0
     ;;
   postinst)
-    if [ ! -f ${TARGET}/etc/bashrc ]; then
-      install -m 0644 ${TARGET}/usr/share/snap-base/bashrc \
-        ${TARGET}/etc/bashrc
-    fi
-    if [ ! -f ${TARGET}/etc/group ]; then
-      install -m 0644 ${TARGET}/usr/share/snap-base/group \
-        ${TARGET}/etc/group
-    fi
-    if [ ! -f ${TARGET}/etc/passwd ]; then
-      install -m 0644 ${TARGET}/usr/share/snap-base/passwd \
-        ${TARGET}/etc/passwd
-    fi
-    if [ ! -f ${TARGET}/etc/profile ]; then
-      install -m 0644 ${TARGET}/usr/share/snap-base/profile \
-        ${TARGET}/etc/profile
-    fi
-    if [ ! -f ${TARGET}/etc/snap.conf ]; then
-      install -m 0644 ${TARGET}/usr/share/snap-base/snap.conf \
-        ${TARGET}/etc/snap.conf
-    fi
     if [ ! -f ${TARGET}/var/log/btmp ]; then
       install -v -m 600 /dev/null ${TARGET}/var/log/btmp
     fi
diff --git a/SRC/snap-base/Makefile b/SRC/snap-base/Makefile
index e6204ed..d4cb8a1 100644
--- a/SRC/snap-base/Makefile
+++ b/SRC/snap-base/Makefile
@@ -1,4 +1,4 @@
-install: base usr etc var lib snap
+install: base usr etc var lib
 
 base:
 	@install -v -d -m 0755 -o root -g root \
@@ -31,16 +31,6 @@ lib: usr
 	@ln -sv lib $(DESTDIR)/lib64 && \
 	ln -sv lib $(DESTDIR)/usr/lib64
 
-snap: usr
-	install -v -d -m 0755 $(DESTDIR)/usr/share/snap-base && \
-	install -v -m 0644 bashrc $(DESTDIR)/usr/share/snap-base/bashrc && \
-	install -v -m 0644 group $(DESTDIR)/usr/share/snap-base/group && \
-	install -v -m 0644 passwd $(DESTDIR)/usr/share/snap-base/passwd && \
-	install -v -m 0644 profile $(DESTDIR)/usr/share/snap-base/profile && \
-	install -v -m 0644 snap.conf \
-		$(DESTDIR)/usr/share/snap-base/snap.conf && \
-	install -v -m 0644 snap_version $(DESTDIR)/etc/snap_version
-
 usr: base
 	@install -v -d -m 0755 -o root -g root \
 		$(DESTDIR)/usr/bin \