- do not enter to REPO_DIR when cloning package repo

[packages/rpm-build-tools.git] / builder

diff --git a/builder b/builder
index 4023652e71a3bdbbdeea587befd1431c7a05367c..484cb1d67d640e8e16a1d1e040af3cc256917c73 100755 (executable)
--- 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=""
@@ -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="|"
@@ -1968,11 +1968,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
 }