From a0480958f1216e9a2284b80c4c4fc4826e5584bf Mon Sep 17 00:00:00 2001
From: Benjamin Schieder <blindcoder@scavenger.homeip.net>
Date: Fri, 15 Aug 2003 15:26:25 +0000
Subject: [PATCH] Benjamin Schieder: updated newpackage.sh

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1079 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE |  1 +
 misc/archive/newpackage.sh              | 32 +++++++++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 4e07fd6a6..24d34b617 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -8,6 +8,7 @@ whole rxr-tree.
  - made mkttfontdir more reliable
  - Daniel Jahre: added cdlabelgen
  - Andreas V. Meier: added wavemon
+ - Benjamin Schieder: updated newpackage.sh
 
 *) 2003-08-14 (2.0.0-camp - 2.0.0-rc1)
 
diff --git a/misc/archive/newpackage.sh b/misc/archive/newpackage.sh
index 887dfc7ea..db7db1f8e 100644
--- a/misc/archive/newpackage.sh
+++ b/misc/archive/newpackage.sh
@@ -38,8 +38,21 @@ if [ "$1" == "-main" ] ; then
 	create_main=1
 	shift
 fi
-dir=$1 ; shift
 
+if [ $# -lt 2 ] ; then
+	cat <<-EEE
+Usage:
+$0 <option> package/repository/packagename Download_1 < Download_2, Download_n >
+
+Where <option> may be:
+	-main		Create a package.conf file with main-function
+
+	EEE
+	exit 1
+fi
+
+
+dir=${1#package/} ; shift
 package=${dir##*/}
 if [ "$package" = "$dir" ]; then
 	echo "failed"
@@ -127,7 +140,9 @@ echo >> $package.desc
 
 echo "ok"
 echo -n "Creating $package.conf ... "
-cat >>$package.conf <<EEE
+
+if [ "$create_main" == "1" ] ; then
+	cat >>$package.conf <<-EEE
 
 # --- ${rc}-NOTE-BEGIN ---
 # 
@@ -151,16 +166,13 @@ cat >>$package.conf <<EEE
 # 
 # --- ${rc}-NOTE-END ---
 
-EEE
-if [ "$create_main" == "1" ] ; then
-	main=$package"_main";
-	cat >>$package.conf <<EEE
-$main() {
-	# TODO
+	EEE
+	cat >>$package.conf <<-EEE
+${package}_main() { #TODO
 }
 
-custmain="$main"
-EEE
+custmain="${package}_main"
+	EEE
 fi
 
 echo "ok"