fix on default config files folder

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@636 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/Makefile b/trunk/Makefile
index 28bab0da5eee30d1a2c88c4d842b5ee3023ec6f3..a0c0dd3bae58d4600e148910f09d798931aef8e5 100644 (file)
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -53,8 +53,8 @@ install_doc:
        $(INSTALL) -D --mode=0644 doc/README.simplaret.pt_BR $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/README.simplaret.pt_BR
 
 install_config:
-       $(INSTALL) -D --mode=0644 conf/$(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE)/default/$(PACKAGE).conf
-       $(INSTALL) -D --mode=0644 conf/repos.conf $(DESTDIR)/etc/$(PACKAGE)/default/repos.conf
+       $(INSTALL) -D --mode=0644 conf/$(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE)/defaults/$(PACKAGE).conf
+       $(INSTALL) -D --mode=0644 conf/repos.conf $(DESTDIR)/etc/$(PACKAGE)/defaults/repos.conf
        @mkdir -p $(DESTDIR)/etc/$(PACKAGE)/defaults/mkbuild/
        @cp mkbuild/* $(DESTDIR)/etc/$(PACKAGE)/defaults/mkbuild/
 

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index f9c115fe180ad68c48c0d9e4ddedec6c7654125e..7b7aca9cde64d2e011c91eec59c4b5140e2f2d3d 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -20,7 +20,7 @@
 
 BASE_CONF="/etc/simplepkg"
 CONF="$BASE_CONF/simplepkg.conf"
-DEFAULT_CONF="$BASE_CONF/default/simplepkg.conf"
+DEFAULT_CONF="$BASE_CONF/defaults/simplepkg.conf"
 JAIL_LIST="$BASE_CONF/jailist"
 SIMPLARET="simplaret"
 

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index ec24ded289b2ee9b9f260a1500427e5ef165ae35..cbf45439ebe8fadeb7543a9cf2bc09e385bf1d4c 100755 (executable)
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -31,7 +31,7 @@ fi
 if [ -f "/etc/simplepkg/repos.conf" ]; then
   REPOS_CONF="/etc/simplepkg/repos.conf"
 else
-  REPOS_CONF="/etc/simplepkg/default/repos.conf"
+  REPOS_CONF="/etc/simplepkg/defaults/repos.conf"
 fi
 
 function simplaret_usage {