bin/push_nightlies.sh | 3 +--
tb/tb_internals.sh | 9 +++++----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 27032299e4c10dfd05a5ec892be7756b109c6ce4
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Tue Feb 26 15:29:21 2013 -0600
tb: support for new location of installable
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 2e5090e..51ec19d 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -859,6 +859,7 @@ push_nightly()
local file=
local target=
local tag=
+ local pack_loc=
# Push build up to the project server (if enabled).
[ $V ] && echo "Push: Nightly builds enabled"
@@ -883,13 +884,13 @@ push_nightly()
if [ -f config_host.mk ] ; then
inpath=$(grep INPATH= config_host.mk | sed -e "s/.*=//")
- else
- return 1
fi
if [ -z "${inpath?}" -o ! -d "instsetoo_native/${inpath?}" ] ; then
- return 1
+ pack_loc="instsetoo_native/${inpath?}"
+ else
+ pack_loc="workdir"
fi
- pushd instsetoo_native/${inpath?} > /dev/null
+ pushd "${pack_loc?}" > /dev/null
mkdir push 2>/dev/null || return 1
stage="./push"
tag="${B?}~${upload_time?}"
commit 4572939a6900a15d683bac4af2d32dd8bee71bde
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Tue Feb 26 15:25:00 2013 -0600
tinbuild2 : tolerate both location for delivery packages
diff --git a/bin/push_nightlies.sh b/bin/push_nightlies.sh
index 9e209c9..d3a7b19 100755
--- a/bin/push_nightlies.sh
+++ b/bin/push_nightlies.sh
@@ -72,8 +72,7 @@ fi
cd instsetoo_native/${INPATH}
if [ $? != 0 ]; then
- echo "cd instsetoo_native/${INPATH} failed" 1>&2
- exit 1
+ cd workdir
fi
if [ "$ASYNC" = "1" ] ; then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
