X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=builder;h=f1d81ba89178a973c8802d0e2c3574d86ee9ea0e;hb=356bd8f70ffe9e8b0bc5a48939663b4615dc8077;hp=4023652e71a3bdbbdeea587befd1431c7a05367c;hpb=3aab96caac8e4f2be29251c8e2ce8dab61df94bd;p=packages%2Frpm-build-tools.git

diff --git a/builder b/builder
index 4023652..f1d81ba 100755
--- a/builder
+++ b/builder
@@ -94,7 +94,7 @@ BCOND=""
 GROUP_BCONDS="no"
 
 # create symlinks for tools in PACKAGE_DIR, see get_spec()
-SYMLINK_TOOLS="no"
+SYMLINK_TOOLS="yes"
 
 PATCHES=""
 SOURCES=""
@@ -119,7 +119,7 @@ NEW_REPO=""
 
 RES_FILE=""
 
-DISTFILES_SERVER="://distfiles.pld-linux.org"
+DISTFILES_SERVER="://df.tld-linux.org"
 ATTICDISTFILES_SERVER="://attic-distfiles.pld-linux.org"
 
 DEF_NICE_LEVEL=19
@@ -816,7 +816,7 @@ get_spec() {
 			else
 				(
 					unset GIT_WORK_TREE
-					git clone  -o $REMOTE_PLD ${GIT_SERVER}:${PACKAGES_DIR}/${ASSUMED_NAME}.git || {
+					git clone -o $REMOTE_PLD ${GIT_SERVER}:${PACKAGES_DIR}/${ASSUMED_NAME}.git "$REPO_DIR/${ASSUMED_NAME}" || {
 						# softfail if new package, i.e not yet added to PLD rep
 						[ ! -f "$ASSUMED_NAME/$SPECFILE" ] && Exit_error err_no_spec_in_repo
 						echo "Warning: package not in CVS - assuming new package"
@@ -890,7 +890,7 @@ find_mirror() {
 	cd "$REPO_DIR"
 	local url="$1"
 	if [ ! -f "mirrors"  ] ; then
-		ln -s rpm-build-tools/mirrors .
+		ln -s scripts/mirrors .
 	fi
 
 	IFS="|"
@@ -1485,7 +1485,8 @@ build_package() {
 			fi
 		fi
 	else
-		eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE
+		BRLISTFILE=$(tempfile)
+		eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE 2>$BRLISTFILE
 		RETVAL=$?
 	fi
 	if [ "$RETVAL" -ne "0" ]; then
@@ -1497,6 +1498,17 @@ build_package() {
 			fi
 			echo ""
 		fi
+		# try to nicely show package list, to just copy&paste it to poldek or so...
+		cat $BRLISTFILE
+		BRLIST=$(awk 'BEGIN{ORS=" ";} NR>1 {print $1;}' $BRLISTFILE)
+		echo
+		echo "To install packages type:"
+		echo "poldek -ivh $BRLIST"
+		echo
+		echo "In poldek, copy these command:"
+		echo "install $BRLIST"
+		echo
+		rm $BRLISTFILE
 		Exit_error err_build_fail
 	fi
 	unset BUILD_SWITCH
@@ -1968,11 +1980,11 @@ init_rpm_dir() {
 	mkdir -p $TOP_DIR $rpmdir $buildir $srpmdir
 
 	cd "$TOP_DIR"
-	if [ ! -e ../rpm-build-tools ]; then
-		git clone  ${GIT_SERVER}:${PACKAGES_DIR}/rpm-build-tools.git ../rpm-build-tools
+	if [ ! -e ../scripts ]; then
+		git clone  ${GIT_SERVER}:${PACKAGES_DIR}/scripts.git ../scripts
 	fi
 	for a in dropin md5 adapter builder mirrors {relup,compile,repackage,pearize}.sh pldnotify.awk; do
-		ln -s ../rpm-build-tools/$a .
+		ln -s ../scripts/$a .
 	done
 	init_builder
 }