Reverted new-freshment.in and new.sh and added `pkg up` to new.in instead.

git-svn-id: svn://svn.opensde.net/opensde/opensde/trunk@21202 10447126-35f2-4685-b0cf-6dd780d3921f

lib/sde-package/new-freshmeat.sh

@@ -474,17 +474,9 @@ if [ "$download_file" ]; then
 
 	[D] 0 $download_file $download_url
 	EOF
-	echo "ok"
-	cd $SDEROOT
-	echo -n "Updating cksum... "
-	if ./bin/sde pkg up $package &> /dev/null;then
-		echo "ok"
-	else
-		echo "failed"
-	fi 
-	cd package/$dir
 fi
 
+echo "ok"
 echo -n "Creating $package.conf ... "
 
 if [ "$create_main" == "1" ] ; then

lib/sde-package/new.in

@@ -60,14 +60,21 @@ package_new() {
 	if [ ! -d "$new_repository" ]; then
 		echo_warning "New repository created. (${new_repository#$SDEROOT/package/})"
 	fi
-
 	cd "$SDEROOT"
 	case "${method}" in
 		freshmeat)
 			fm_name=${1:-$new_package}
-			exec /bin/bash ./lib/sde-package/new-freshmeat.sh ${new_repository#$SDEROOT/package/}/$new_package "$fm_name"
+			/bin/bash ./lib/sde-package/new-freshmeat.sh ${new_repository#$SDEROOT/package/}/$new_package "$fm_name"
 			;;
-		*)	exec /bin/sh ./lib/sde-package/new.sh ${new_repository#$SDEROOT/package/}/$new_package "$@"
+		*)	/bin/sh ./lib/sde-package/new.sh ${new_repository#$SDEROOT/package/}/$new_package "$@"
 			;;
 	esac
+	if [ -e package/*/$new_package/$new_package.desc ];then	
+		echo -n "Updating chksum $new_package... "
+		if ./bin/sde pkg up $new_package &> /dev/null;then
+			echo "ok"
+		else
+			echo "failed"
+		fi
+	fi
 }

lib/sde-package/new.sh

@@ -137,13 +137,8 @@ ${package}_main() {
 custmain="${package}_main"
 EEE
 fi
+
 echo "ok"
-echo -n "Updating cksum... "
-if ./bin/sde pkg up $package &> /dev/null;then
-	echo "ok"
-else
-	echo "failed"
-fi
 echo "Remember to fill in the TODO's:"
 grep TODO $confdir/$package.*
 echo