Move scripts to bin

Keep less clutter in root dir

diff --git a/addbr b/bin/addbr
similarity index 100%
rename from addbr
rename to bin/addbr

diff --git a/cleanbuild-docker.sh b/bin/cleanbuild-docker.sh
similarity index 88%
rename from cleanbuild-docker.sh
rename to bin/cleanbuild-docker.sh
index 6616bcd23e5ce792bfd1fbf0ee05e498dc25d84a..861c74d8b9fd5cb46154286363c896630a80a873 100755 (executable)
--- a/cleanbuild-docker.sh
+++ b/bin/cleanbuild-docker.sh
@@ -100,12 +100,12 @@ package_build() {
                # install deps
                docker exec $name builder -g -R "$@"
                # remove .la dependencies
-               docker exec --user=root -w / $name $home/cleanbuild/cleanup-la
+               docker exec --user=root -w / $name $home/cleanbuild/bin/cleanup-la
                # reset findunusedbr state after deps install
-               docker exec --user=root -w / $name $home/cleanbuild/findunusedbr -c / $home/rpm/packages/$PACKAGE_NAME/$PACKAGE_NAME.spec
+               docker exec --user=root -w / $name $home/cleanbuild/bin/findunusedbr -c / $home/rpm/packages/$PACKAGE_NAME/$PACKAGE_NAME.spec
 
                # actual build
-               docker exec $name cleanbuild/teeboth $buildlog builder -bb --define '__spec_clean_body %{nil}' "$@" && rc=$? || rc=$?
+               docker exec $name cleanbuild/bin/teeboth $buildlog builder -bb --define '__spec_clean_body %{nil}' "$@" && rc=$? || rc=$?
 
                findbr=$PACKAGE_NAME.findbr.log
                builddir=$(docker exec $name sh -c 'test ! -d rpm/BUILD/* || echo rpm/BUILD/*')
@@ -114,7 +114,7 @@ package_build() {
                        exit 6
                fi
                # need root to run poldek
-               docker exec --user=root -w / $name sh -c "cd $home && cleanbuild/findbr $builddir $buildlog" > $findbr
+               docker exec --user=root -w / $name sh -c "cd $home && cleanbuild/bin/findbr $builddir $buildlog" > $findbr
 
                installed_something=false
                while read pkg msg; do
@@ -126,7 +126,7 @@ package_build() {
                # go for another try
                $installed_something && continue
 
-               docker exec --user=root -w / $name $home/cleanbuild/findunusedbr -c / $home/rpm/packages/$PACKAGE_NAME/$PACKAGE_NAME.spec
+               docker exec --user=root -w / $name $home/cleanbuild/bin/findunusedbr -c / $home/rpm/packages/$PACKAGE_NAME/$PACKAGE_NAME.spec
 
                if [ $rc -eq 0 ] && ! $KEEP_CONTAINER; then
                        # finished ok, cleanup

diff --git a/cleanbuild-vserver.sh b/bin/cleanbuild-vserver.sh
similarity index 96%
rename from cleanbuild-vserver.sh
rename to bin/cleanbuild-vserver.sh
index 3502a742e3aef9647f0fb84abd7077083d787901..5429a54d1489b7bd1611836644dafc518b1d4ee8 100755 (executable)
--- a/cleanbuild-vserver.sh
+++ b/bin/cleanbuild-vserver.sh
@@ -491,7 +491,7 @@ fi
 while true; do
        info "Building $build_pkg in $CHNAME"
        rebuilddb
-       ./cleanup-la $CHDIR
+       ./bin/cleanup-la $CHDIR
        buildlog="buildlogs/$build_pkg"
        if [ -r $buildlog ]; then
                i=1
@@ -501,9 +501,9 @@ while true; do
                info "moving $buildlog to $buildlog.$i"
                mv $buildlog $buildlog.$i
        fi
-       ./findunusedbr -c $CHDIR $HOME/rpm/packages/$build_pkg/$build_pkg.spec
+       ./bin/findunusedbr -c $CHDIR $HOME/rpm/packages/$build_pkg/$build_pkg.spec
        title "building"
-       ./teeboth $buildlog chroot $CHDIR su $USER -c "$CHHOME/rpm/packages/builder -nn --define '_enable_debug_packages 0' -bb $build_pkg $builder_options"
+       ./bin/teeboth $buildlog chroot $CHDIR su $USER -c "$CHHOME/rpm/packages/builder -nn --define '_enable_debug_packages 0' -bb $build_pkg $builder_options"
        ECODE=$?
 
        if grep -q "error: Failed build dependencies:" $buildlog; then
@@ -519,13 +519,13 @@ while true; do
                fi
        fi
 
-       ./findbr $CHDIR/$BUILDDIR $buildlog > $$.installed
+       ./bin/findbr $CHDIR/$BUILDDIR $buildlog > $$.installed
        installed_something=false
        while read pkg msg; do
                if poldek_install $pkg; then
                        info "findbr:" $pkg "installed"
                        echo "$pkg $msg" >> installed/$build_pkg
-                       ./addbr $build_pkg "$pkg" "$msg"
+                       ./bin/addbr $build_pkg "$pkg" "$msg"
                        installed_something=true
                else
                        warn "findbr:" $pkg "not installed"
@@ -537,7 +537,7 @@ while true; do
        if [ $ECODE -eq 0 ]; then
                $CLEANAFTER && clean
                addlist BUILT_OK
-               ./findunusedbr $CHDIR $HOME/rpm/packages/$build_pkg/$build_pkg.spec
+               ./bin/findunusedbr $CHDIR $HOME/rpm/packages/$build_pkg/$build_pkg.spec
                info "$build_pkg built OK !"
                title "OK !"
                exit 0

diff --git a/cleanpoldekcache b/bin/cleanpoldekcache
similarity index 100%
rename from cleanpoldekcache
rename to bin/cleanpoldekcache

diff --git a/cleanup-la b/bin/cleanup-la
similarity index 100%
rename from cleanup-la
rename to bin/cleanup-la

diff --git a/findbr b/bin/findbr
similarity index 99%
rename from findbr
rename to bin/findbr
index 4000f7db30daeb3ffcbc8a016fe9de052777a9a7..403db2ec7975504807aa69cb914fc9d226f3cac7 100755 (executable)
--- a/findbr
+++ b/bin/findbr
@@ -65,7 +65,7 @@ my %skip;
 # for m4 in *.m4; do R=$(rpm -qf $m4); R=${R%-*-*}; \
 #   awk -vr=$R '/^\s*(AC_DEFUN|AU_ALIAS)/ { gsub(/\].*/,""); gsub(/.*\[/,""); print r " " $0}' $m4; \
 # done | sort | awk '{print "\t\"" $2 "\" => \"" $1 "\","}'
-my %ac2br = do (DOCKER ? './cleanbuild/findbr-ac2br' : './findbr-ac2br');
+my %ac2br = do (DOCKER ? './cleanbuild/bin/findbr-ac2br' : './bin/findbr-ac2br');
 
 my %cmake2br = (
        "findkde4:44" => "kde4-kdelibs",

diff --git a/findbr-ac2br b/bin/findbr-ac2br
similarity index 100%
rename from findbr-ac2br
rename to bin/findbr-ac2br

diff --git a/findunusedbr b/bin/findunusedbr
similarity index 100%
rename from findunusedbr
rename to bin/findunusedbr

diff --git a/fixfreq b/bin/fixfreq
similarity index 100%
rename from fixfreq
rename to bin/fixfreq

diff --git a/multibuild b/bin/multibuild
similarity index 100%
rename from multibuild
rename to bin/multibuild

diff --git a/teeboth b/bin/teeboth
similarity index 100%
rename from teeboth
rename to bin/teeboth

diff --git a/cleanbuild b/cleanbuild
index af431e55454a461304700a55fc32bc0832b769a9..498b5de6a68d6831175ed7f2f20cec6e176e5899 100755 (executable)
--- a/cleanbuild
+++ b/cleanbuild
@@ -11,4 +11,4 @@ cd "$dir"
 # backend to use: vserver or docker
 BACKEND=${BACKEND:-docker}
 
-exec ./cleanbuild-$BACKEND.sh "$@"
+exec ./bin/cleanbuild-$BACKEND.sh "$@"