From 07dac74d87f5a531edfd7cf729bc264fd312d0ef Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Tue, 2 Feb 2016 15:56:06 +0000
Subject: [PATCH] fix: Ytools build wasn't self-contained, i.e. pkg.sh was not
 found from source

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/create-mkdebian.sh |  2 +-
 scripts/create-mkspec.sh   |  4 +++-
 scripts/pkg.sh             | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/scripts/create-mkdebian.sh b/scripts/create-mkdebian.sh
index 5e3d341d..8e288002 100644
--- a/scripts/create-mkdebian.sh
+++ b/scripts/create-mkdebian.sh
@@ -105,7 +105,7 @@ override_dh_auto_install:
 	mkdir -p \`dirname \$INSTALL_LOG\`
 	> \$INSTALL_LOG
 	\\\$(MAKE) ENV_PREFIX=\\\$(ENV_PREFIX) INSTALL_LOG=\\\$(INSTALL_LOG) install
-	/bin/bash $dir/pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR)
+	PATH=$MOD_SCRIPT_DIR:\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR)
 	dh_installdirs
 
 override_dh_shlibdeps:
diff --git a/scripts/create-mkspec.sh b/scripts/create-mkspec.sh
index 183f6d23..74671676 100644
--- a/scripts/create-mkspec.sh
+++ b/scripts/create-mkspec.sh
@@ -50,6 +50,7 @@ ini_value global.subpackages | grep -q run && _cat << EOT
 	|echo "%prep -n \$NAME-run"
 	|echo ""
 EOT
+
 _cat << EOT
 	|echo "%setup -q -n \$NAME-\$V"
 	|echo ""
@@ -65,7 +66,8 @@ _cat << EOT
 	|echo "mkdir -p \`dirname \$INSTALL_LOG\`"
 	|echo "> \$INSTALL_LOG"
 	|echo "make install"
-	|echo "/bin/bash $dir/pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
+	|echo "export PATH=$MOD_SCRIPT_DIR:\\\$PATH"
+	|echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
 	|echo ""
 EOT
 ini_value global.subpackages | grep -q run && _cat << EOT
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index c611dfc3..095b28f2 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -412,6 +412,8 @@ build_pkg()
 		local deffmt
 		case $pkgfmt in
 		rpm)
+			# historical mess:
+			# pkg.sh -> mkspec_wrapper.sh -> create-mkspec.sh -> mkspec.sh -> spec -> rpmbuild spec > /var/tmp/xy.sh -> pkg.sh milk-install-log
 			deffmt=spec;;
 		debian|deb)
 			deffmt=debian;;
@@ -432,7 +434,7 @@ build_pkg()
 				fatal "Failed to read project description file \"$PROJECT_DESCR_FILE\"."
 			[ ! -r "$create_mkdef_sh" ] && \
 				fatal "Failed to read package build definition creation script \"$create_mkdef_sh\"."
-			/bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp
+			PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp
 			mv $mkdef_sh.tmp $mkdef_sh
 			tmp_mkdef_sh="$tmp_mkdef_sh $mkdef_sh"
 		}
@@ -442,7 +444,7 @@ build_pkg()
 
 		(
 			cd $src_tree
-			/bin/bash $mkdef_wrapper_sh $mkdef_sh \
+			PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \
 				-V $version \
 				-S $tar_archive \
 				-N $RPM_PROJECT \
@@ -846,7 +848,7 @@ trap goodbye SIGINT SIGKILL
 
 # -- default values
 TOPDIR=.
-MOD_SCRIPT_DIR=/opt/ytools/bin
+MOD_SCRIPT_DIR=`dirname $0`
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false
 #LAST_RPM_VERSION=`read_map $TOPDIR/LAST_RPM_VERSION`
 myname=`basename $0`
@@ -928,6 +930,9 @@ while [ "$1" != -- ] ; do
 done
 shift
 
+export MOD_SCRIPT_DIR=`readlink -f $MOD_SCRIPT_DIR`
+export PKG_SH=`readlink -f $0`
+
 SRPMS_DIR=`find_path $HOME/rpmbuild/SRPMS /usr/src/packages/SRPMS`
 RPMS_DIR=`find_path $HOME/rpmbuild/RPMS/$RPM_ARCH /usr/src/packages/RPMS/$RPM_ARCH`