diff options
author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-05 21:14:16 +0000 |
---|---|---|
committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-04-05 21:14:16 +0000 |
commit | 6feedd13bf2b4eeb2fbf47419cd372bf802b5d44 (patch) | |
tree | 4fec2261b1259773627daf0c3a82c9e52a8c16eb /trunk | |
parent | 551a94bb3859f5532a2a7394cc322f0b2612b3eb (diff) | |
download | simplepkg-6feedd13bf2b4eeb2fbf47419cd372bf802b5d44.tar.gz simplepkg-6feedd13bf2b4eeb2fbf47419cd372bf802b5d44.tar.bz2 |
templatepkg: small fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@264 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
-rwxr-xr-x | trunk/src/templatepkg | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg index 88dd4db..e17bb82 100755 --- a/trunk/src/templatepkg +++ b/trunk/src/templatepkg @@ -203,7 +203,7 @@ function template_create { svn mkdir $TEMPLATE_BASE.s info_commit="yes" else - mkdir -p $TEMPLATE_BASE.d + mkdir -p $TEMPLATE_BASE.s fi if ! svn_check $TEMPLATE_BASE.template; then @@ -217,9 +217,11 @@ function template_create { fi elif use_svn && [ -d "$BASE_CONF/templates/.svn" ]; then + cd $BASE_CONF/templates svn add `basename $TEMPLATE_BASE` info_commit="yes" + else mkdir $TEMPLATE_BASE.{d,s} fi @@ -243,8 +245,8 @@ function template_create { if use_svn && [ -d "$orig_template/.svn" ]; then rsync -av --exclude=.svn $orig_template/$ROOT.d/ $TEMPLATE_BASE.d/ - cd $TEMPLATE_BASE.d - svn add * + cd `dirname $TEMPLATE_BASE` + svn add `basename $TEMPLATE_BASE` info_commit="yes" else rsync -av $orig_template/$ROOT.d/ $TEMPLATE_BASE.d/ |