various small fixes, see CHANGELOG

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 847ec3b9d5891b98e8dc36a2f3c58f9ee755852e..659076dc4c4e3c529cbe848fecbd81d23d1741ae 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,7 +1,9 @@
 simplepkg changelog
 -------------------
 
-0.4.9pre2: re-organized the source repository
+0.4.9pre2: fixed simplepkg.SlackBuild
+           fixed doinst.sh
+           re-organized the source repository
            added createpkg
            updated README and README.pt_BR
 

diff --git a/install/doinst.sh b/install/doinst.sh
index f2051587dd46b88048595c0dd55d2c6fadb039b9..f3af964c364f1e87ae847e144e12e1fe5467b93f 100644 (file)
--- a/install/doinst.sh
+++ b/install/doinst.sh
@@ -1,2 +1,2 @@
-( if [ ! -f "/etc/simplepkg/simplepkg.conf" ]; then mv /etc/simplepkg.conf.new /etc/simplepkg/simplepkg.conf; fi )
-( if [ ! -f "/etc/simplepkg/repos.conf" ]; then mv /etc/simplepkg/repos.conf.new /etc/simplepkg/repos.conf; fi )
+( if [ ! -f "etc/simplepkg/simplepkg.conf" ]; then mv etc/simplepkg/simplepkg.conf.new etc/simplepkg/simplepkg.conf; fi )
+( if [ ! -f "etc/simplepkg/repos.conf" ]; then mv etc/simplepkg/repos.conf.new etc/simplepkg/repos.conf; fi )

diff --git a/simplepkg.SlackBuild b/simplepkg.SlackBuild
index 7f435b2e0146f3efd7ee7177da18cdfeca7f87cf..74606decb9d1738cc5a92bacb5cbc5cb95f21ea7 100755 (executable)
--- a/simplepkg.SlackBuild
+++ b/simplepkg.SlackBuild
@@ -5,7 +5,7 @@
 
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
-BUILD="1rha"
+BUILD="4rha"
 VERSION="0.4.9pre2"
 ARCH="noarch"
 
@@ -48,10 +48,6 @@ cp conf/repos.conf.new $PACK_DIR/etc/$PACKAGE
 cd $PACK_DIR/usr/sbin && ln -s jail-upgrade vserver-upgrade
 cd -
 
-# install script
-echo '( if [ ! -f "/etc/simplepkg/simplepkg.conf" ]; then mv /etc/simplepkg.conf.new /etc/simplepkg/simplepkg.conf; fi )' > install/doinst.sh
-echo '( if [ ! -f "/etc/simplepkg/repos.conf" ]; then mv /etc/simplepkg/repos.conf.new /etc/simplepkg/repos.conf; fi )' >> install/doinst.sh
-
 cd $PACK_DIR
 chown -R root.root *