Move scripts to bin

Keep less clutter in root dir

12 files changed, 13 insertions, 13 deletions

diff --git a/addbr b/bin/addbr
index 6ab3dd4..6ab3dd4 100755
--- a/addbr
+++ b/bin/addbr
diff --git a/cleanbuild-docker.sh b/bin/cleanbuild-docker.sh
index 6616bcd..861c74d 100755
--- 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
index 3502a74..5429a54 100755
--- 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
index 24bd318..24bd318 100755
--- a/cleanpoldekcache
+++ b/bin/cleanpoldekcache
diff --git a/cleanup-la b/bin/cleanup-la
index 2db6fd5..2db6fd5 100755
--- a/cleanup-la
+++ b/bin/cleanup-la
diff --git a/findbr b/bin/findbr
index 4000f7d..403db2e 100755
--- 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
index 1a3e146..1a3e146 100644
--- a/findbr-ac2br
+++ b/bin/findbr-ac2br
diff --git a/findunusedbr b/bin/findunusedbr
index daf4c37..daf4c37 100755
--- a/findunusedbr
+++ b/bin/findunusedbr
diff --git a/fixfreq b/bin/fixfreq
index befec4d..befec4d 100755
--- a/fixfreq
+++ b/bin/fixfreq
diff --git a/multibuild b/bin/multibuild
index acf5330..acf5330 100755
--- a/multibuild
+++ b/bin/multibuild
diff --git a/teeboth b/bin/teeboth
index 6054118..6054118 100755
--- a/teeboth
+++ b/bin/teeboth
diff --git a/cleanbuild b/cleanbuild
index af431e5..498b5de 100755
--- 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 "$@"