From 4efaebc4ed4d02b358e134e9251780858f135a4a Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Fri, 28 Nov 2008 17:48:16 +0000
Subject: fix

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@605 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/lib/common.sh | 26 +++++++++++++++-----------
 trunk/src/createpkg |  4 +++-
 2 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'trunk')

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index a49257a..cbe6680 100644
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -599,19 +599,23 @@ function svn_copy {
   # svn add file
   [ $# -ne 2 ] && handle_error $ERROR_PAR_NUMBER
 
-  orig="`dirname $1`"
-  file="`basename $1`"
-  dest="$2"
+  if [ -e "$1" ]; then
 
-  if [ -d "$dest" ]; then
-    dest="$dest/$file"
-  fi
+    orig="`dirname $1`"
+    file="`basename $1`"
+    dest="$2"
+
+    if [ -d "$dest" ]; then
+      dest="$dest/$file"
+    fi
+
+    # copy file
+    cp $orig/$file $dest
+    if [ -d "`dirname $dest`/.svn" ]; then
+      chown_svn $dest && chgrp_svn $dest
+      ( cd `dirname $dest` && svn_add `basename $dest` )
+    fi
 
-  # copy file
-  cp $orig/$file $dest
-  if [ -d "`dirname $dest`/.svn" ]; then
-    chown_svn $dest && chgrp_svn $dest
-    ( cd `dirname $dest` && svn_add `basename $dest` )
   fi
 
 }
diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 235addd..4642a07 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -696,7 +696,9 @@ if [ $MAKEPKG_REPOS_NOARCH -eq $on ] && [ "`package_arch $PKG_NAME`" == "noarch"
   echo Copying package to noarch repository...
   create_repo_folder $NOARCH_REPOS
   remove_old_package_data $NOARCH_REPOS
-  svn_copy $NEW_REPOS/$PACKAGE* $NOARCH_REPOS/$SUBFOLDER/
+  svn_copy $NEW_REPOS/$PKG_NAME $NOARCH_REPOS/$SUBFOLDER/
+  svn_copy $NEW_REPOS/`basename $PKG_NAME .tgz`.meta $NOARCH_REPOS/$SUBFOLDER/
+  svn_copy $NEW_REPOS/$PACKAGE.slack-required $NOARCH_REPOS/$SUBFOLDER/
   update_metadata $NOARCH_REPOS
   svn_remove_empty_folders $NOARCH_REPOS
 fi
-- 
cgit v1.2.3