aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrudson <rudson@04377dda-e619-0410-9926-eae83683ac58>2007-04-21 16:53:40 +0000
committerrudson <rudson@04377dda-e619-0410-9926-eae83683ac58>2007-04-21 16:53:40 +0000
commit45761cff4b1d329966f2f53407cb70d7e2966311 (patch)
tree88cda621f811ab66787f3c2b879a4fdaf7431c25
parentd0a7843a8bbd5b6b9f9bb9b238f405c222e4aa39 (diff)
downloadsimplepkg-45761cff4b1d329966f2f53407cb70d7e2966311.tar.gz
simplepkg-45761cff4b1d329966f2f53407cb70d7e2966311.tar.bz2
atualizando o instalador
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@357 04377dda-e619-0410-9926-eae83683ac58
-rw-r--r--branches/0.6/install/doinst.sh2
-rwxr-xr-xbranches/0.6/simplepkg.SlackBuild6
2 files changed, 4 insertions, 4 deletions
diff --git a/branches/0.6/install/doinst.sh b/branches/0.6/install/doinst.sh
index a61648e..a9d11ce 100644
--- a/branches/0.6/install/doinst.sh
+++ b/branches/0.6/install/doinst.sh
@@ -1,3 +1,3 @@
( 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 )
-( if [ ! -f "etc/simplepkg/generic.mkslackbuild" ]; then mv etc/simplepkg/generic.mkSlackBuild.new etc/simplepkg/generic.mkSlackBuild; fi )
+( if [ ! -f "etc/simplepkg/defaults/mkbuild/generic.mkSlackBuild" ]; then mv etc/simplepkg/defaults/mkbuild/generic.mkSlackBuild.new etc/simplepkg/defaults/mkbuild/generic.mkSlackBuild; fi )
diff --git a/branches/0.6/simplepkg.SlackBuild b/branches/0.6/simplepkg.SlackBuild
index 8af292f..48a02d8 100755
--- a/branches/0.6/simplepkg.SlackBuild
+++ b/branches/0.6/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
PACKAGE="simplepkg"
PACK_DIR="package-$PACKAGE"
BUILD=${BUILD:=1rha}
-VERSION="0.6branch_01"
+VERSION="0.6"
ARCH="noarch"
LIBEXEC="/usr/libexec/$PACKAGE"
BINDIR="/usr/bin"
@@ -47,11 +47,11 @@ for file in $DOC_LIST; do
cp doc/$file $PACK_DIR/$DOC_DIR/$PACKAGE-$VERSION/
done
-mkdir -p $PACK_DIR/etc/$PACKAGE/{defaults,templates}
+mkdir -p $PACK_DIR/etc/$PACKAGE/{defaults/mkbuild,templates}
rsync -av --exclude=.svn templates/* $PACK_DIR/etc/$PACKAGE/defaults/templates/
chmod +x $PACK_DIR/etc/$PACKAGE/defaults/templates/vserver/vserver.s/*.sh
chmod +x $PACK_DIR/etc/$PACKAGE/defaults/templates/vserver-legacy/vserver-legacy.s/*.sh
-cp conf/simplepkg.conf.new $PACK_DIR/etc/$PACKAGE
+cp mkbuild/generic.mkSlackBuild.new $PACK_DIR/etc/$PACKAGE/defaults/mkbuild/
cp conf/repos.conf.new $PACK_DIR/etc/$PACKAGE
cp conf/generic.mkSlackBuild.new $PACK_DIR/etc/$PACKAGE
cp utils/exec-slackbuild $PACK_DIR/$SBINDIR/