aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2008-09-30 08:26:59 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2008-09-30 08:26:59 +0000
commit5c29d9a8ff3db169a7b65ac6ccb619a984697533 (patch)
treec8227bc7b70e8ecea1306a12e285283c877b3ab1
parent7041544052f895187f2371d0c143911aefa69a6e (diff)
replaced `` syntax with $();
added a 1-before-last line to the logfile indicating the uploaded package (LATER use this to rename the logfile to something more meaningful; FIRST wait whether everything still works...) svn path=/trunk/; revision=10317
-rw-r--r--scripts/auto-build/auto-build-common8
-rwxr-xr-xscripts/auto-build/mail-mingw-log-hack.sh1
-rw-r--r--scripts/auto-build/pd-devel-auto-builder.sh4
-rwxr-xr-xscripts/auto-build/pd-extended-auto-builder.sh17
-rw-r--r--scripts/auto-build/pd-extended-release-auto-builder.sh14
-rwxr-xr-xscripts/auto-build/pd-main+libs-auto-builder.sh14
-rwxr-xr-xscripts/auto-build/pd-main-auto-builder.sh18
-rwxr-xr-xscripts/auto-build/pd-puredyne-auto-builder.sh12
-rwxr-xr-xscripts/auto-build/prep-auto-build-upload10
-rwxr-xr-xscripts/auto-build/pure-data-rsync4
-rwxr-xr-xscripts/auto-build/pure-data-rsync-checkout6
-rwxr-xr-xscripts/auto-build/run-automated-builder10
-rwxr-xr-xscripts/auto-build/tcltk_core-8-4-branch_auto-builder.sh12
-rwxr-xr-xscripts/auto-build/tcltk_core-8-5-branch_auto-builder.sh12
14 files changed, 79 insertions, 63 deletions
diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common
index 73134d51..2c004316 100644
--- a/scripts/auto-build/auto-build-common
+++ b/scripts/auto-build/auto-build-common
@@ -1,9 +1,9 @@
# these are common variables for the auto-build scripts
-HOSTNAME=`hostname | sed 's|\([a-zA-Z0-9-]\)\..*|\1|' | sed 'y|ABCDEFGHIJKLMNOPQRSTUVWXYZ|abcdefghijklmnopqrstuvwxyz|'`
-SYSTEM=`uname -s | sed 'y|ABCDEFGHIJKLMNOPQRSTUVWXYZ|abcdefghijklmnopqrstuvwxyz|'`
-DATE=`date +%Y-%m-%d`
-TIME=`date +%H.%M.%S`
+HOSTNAME=$(hostname | sed 's|\([a-zA-Z0-9-]\)\..*|\1|' | sed 'y|ABCDEFGHIJKLMNOPQRSTUVWXYZ|abcdefghijklmnopqrstuvwxyz|')
+SYSTEM=$(uname -s | sed 'y|ABCDEFGHIJKLMNOPQRSTUVWXYZ|abcdefghijklmnopqrstuvwxyz|')
+DATE=$(date +%Y-%m-%d)
+TIME=$(date +%H.%M.%S)
## the following creates a spam-bot that sends emails to an address that has not asked for it
## because of the spam-problem, i (jmz) have disabled it
diff --git a/scripts/auto-build/mail-mingw-log-hack.sh b/scripts/auto-build/mail-mingw-log-hack.sh
index 6b4a09cd..0c1d5d1d 100755
--- a/scripts/auto-build/mail-mingw-log-hack.sh
+++ b/scripts/auto-build/mail-mingw-log-hack.sh
@@ -23,7 +23,6 @@ for logfile in $(ls -1 /var/www/auto-build/${DATE}/logs/${DATE}_*_mingw*.txt); d
if [ "x${RECIPIENT}" != "x" ]; then
SUBJECT="autobuild: $distro $HOSTNAME $DATE $TIME"
mailbody_on_failure "${logfile}" | mail -s "autobuild: $logfile" ${RECIPIENT}
-# tail -20 ${logfile} | mail -s "autobuild: $logfile" ${RECIPIENT}
fi
fi
done
diff --git a/scripts/auto-build/pd-devel-auto-builder.sh b/scripts/auto-build/pd-devel-auto-builder.sh
index b4a2a6d4..2bd4b94f 100644
--- a/scripts/auto-build/pd-devel-auto-builder.sh
+++ b/scripts/auto-build/pd-devel-auto-builder.sh
@@ -1,11 +1,11 @@
#!/bin/sh
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
case $SYSTEM in
linux)
diff --git a/scripts/auto-build/pd-extended-auto-builder.sh b/scripts/auto-build/pd-extended-auto-builder.sh
index 56824f28..d47d200b 100755
--- a/scripts/auto-build/pd-extended-auto-builder.sh
+++ b/scripts/auto-build/pd-extended-auto-builder.sh
@@ -2,11 +2,13 @@
# this script is the first attempt to have an automated updater and builder
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+## this could be done more easily with ${0%/*}
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+## this could be done more easily with ${0##*/}
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
BUILD_DIR=.
case $SYSTEM in
@@ -34,8 +36,9 @@ esac
# convert into absolute path
-cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`/../..
-auto_build_root_dir=`pwd`
+## shouldn't this use the ${SCRIPT_DIR} variable rather than call an external program?
+cd $(echo $0 | sed 's|\(.*\)/.*$|\1|')/../..
+auto_build_root_dir=$(pwd)
echo "root: $auto_build_root_dir"
# let rsync handle the cleanup with --delete
@@ -63,11 +66,11 @@ upload_build ()
build_folder=$2
archive_format=$3
- archive=`ls -1 ${auto_build_root_dir}/packages/${platform_folder}/${build_folder}/Pd*.${archive_format} | tail -1`
+ archive=$(ls -1 ${auto_build_root_dir}/packages/${platform_folder}/${build_folder}/Pd*.${archive_format} | tail -1)
echo "upload specs $1 $2 $3"
echo "Uploading $archive"
- upload_filename=`ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"`
+ upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|")
if [ -e ${archive} ]; then
case $SYSTEM in
mingw*)
@@ -76,12 +79,14 @@ upload_build ()
md5sum ${archive} > ${archive}.md5 && \
/c/cygwin/bin/sh -c \
"rsync -a ${archive}.md5 rsync://128.238.56.50/upload/${DATE}/${upload_filename}.md5" && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
*)
rsync -a ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \
md5sum ${archive} > ${archive}.md5 && \
rsync -a ${archive}.md5 rsync://128.238.56.50/upload/${DATE}/${upload_filename}.md5 && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
esac
diff --git a/scripts/auto-build/pd-extended-release-auto-builder.sh b/scripts/auto-build/pd-extended-release-auto-builder.sh
index 56824f28..b5500d7c 100644
--- a/scripts/auto-build/pd-extended-release-auto-builder.sh
+++ b/scripts/auto-build/pd-extended-release-auto-builder.sh
@@ -2,11 +2,11 @@
# this script is the first attempt to have an automated updater and builder
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
BUILD_DIR=.
case $SYSTEM in
@@ -34,8 +34,8 @@ esac
# convert into absolute path
-cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`/../..
-auto_build_root_dir=`pwd`
+cd $(echo $0 | sed 's|\(.*\)/.*$|\1|')/../..
+auto_build_root_dir=$(pwd)
echo "root: $auto_build_root_dir"
# let rsync handle the cleanup with --delete
@@ -63,11 +63,11 @@ upload_build ()
build_folder=$2
archive_format=$3
- archive=`ls -1 ${auto_build_root_dir}/packages/${platform_folder}/${build_folder}/Pd*.${archive_format} | tail -1`
+ archive=$(ls -1 ${auto_build_root_dir}/packages/${platform_folder}/${build_folder}/Pd*.${archive_format} | tail -1)
echo "upload specs $1 $2 $3"
echo "Uploading $archive"
- upload_filename=`ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"`
+ upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|")
if [ -e ${archive} ]; then
case $SYSTEM in
mingw*)
@@ -76,12 +76,14 @@ upload_build ()
md5sum ${archive} > ${archive}.md5 && \
/c/cygwin/bin/sh -c \
"rsync -a ${archive}.md5 rsync://128.238.56.50/upload/${DATE}/${upload_filename}.md5" && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
*)
rsync -a ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \
md5sum ${archive} > ${archive}.md5 && \
rsync -a ${archive}.md5 rsync://128.238.56.50/upload/${DATE}/${upload_filename}.md5 && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
esac
diff --git a/scripts/auto-build/pd-main+libs-auto-builder.sh b/scripts/auto-build/pd-main+libs-auto-builder.sh
index b1fef626..4413884e 100755
--- a/scripts/auto-build/pd-main+libs-auto-builder.sh
+++ b/scripts/auto-build/pd-main+libs-auto-builder.sh
@@ -2,11 +2,11 @@
# this script is the first attempt to have an automated updater and builder
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
BUILD_DIR=.
case $SYSTEM in
@@ -34,8 +34,8 @@ esac
# convert into absolute path
-cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`/../..
-auto_build_root_dir=`pwd`
+cd $(echo $0 | sed 's|\(.*\)/.*$|\1|')/../..
+auto_build_root_dir=$(pwd)
echo "root: $auto_build_root_dir"
# let rsync handle the cleanup with --delete
@@ -59,16 +59,18 @@ upload_build ()
echo "upload specs $1 $2 $3"
echo "Uploading $archive"
- upload_filename=`ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"`
+ upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|")
case $SYSTEM in
mingw*)
test -e ${archive} && /c/cygwin/bin/sh -c \
- "rsync -a ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" &&\
+ "rsync -a ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
*)
test -e ${archive} && rsync -a ${archive} \
rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
esac
diff --git a/scripts/auto-build/pd-main-auto-builder.sh b/scripts/auto-build/pd-main-auto-builder.sh
index 6676878b..c494b029 100755
--- a/scripts/auto-build/pd-main-auto-builder.sh
+++ b/scripts/auto-build/pd-main-auto-builder.sh
@@ -1,20 +1,20 @@
#!/bin/sh
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
case $SYSTEM in
linux)
configure_options="--enable-alsa --enable-jack"
- platform_name=`uname -m`
+ platform_name=$(uname -m)
;;
darwin)
configure_options=""
- platform_name=`uname -p`
+ platform_name=$(uname -p)
;;
mingw*)
configure_options=""
@@ -31,8 +31,8 @@ case $SYSTEM in
esac
# convert into absolute path
-cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`/../..
-auto_build_root_dir=`pwd`
+cd $(echo $0 | sed 's|\(.*\)/.*$|\1|')/../..
+auto_build_root_dir=$(pwd)
echo "root: $auto_build_root_dir"
@@ -43,8 +43,8 @@ rsync -av --delete rsync://128.238.56.50/distros/pd-main/ \
case $SYSTEM in
darwin)
archive_format=dmg
- archive=`ls -1 ${auto_build_root_dir}/packages/darwin_app/Pd*.dmg`
- upload_filename=`ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"`
+ archive=$(ls -1 ${auto_build_root_dir}/packages/darwin_app/Pd*.dmg)
+ upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|")
cd ${auto_build_root_dir}/packages/darwin_app/
make package_clean
make test_locations
@@ -53,6 +53,7 @@ case $SYSTEM in
make package && \
rsync -a ${archive} \
rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
*)
@@ -65,6 +66,7 @@ case $SYSTEM in
tar cjf $package_name pd && \
rsync -a ${package_name} rsync://128.238.56.50/upload/${DATE}/ && \
rm -f -- ${package_name} && \
+ echo "successfully uploaded: ${package_name}" && \
echo SUCCESS
;;
esac
diff --git a/scripts/auto-build/pd-puredyne-auto-builder.sh b/scripts/auto-build/pd-puredyne-auto-builder.sh
index 366428ff..c50a2227 100755
--- a/scripts/auto-build/pd-puredyne-auto-builder.sh
+++ b/scripts/auto-build/pd-puredyne-auto-builder.sh
@@ -2,11 +2,11 @@
# this script is the first attempt to have an automated updater and builder
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
BUILD_DIR=.
case $SYSTEM in
@@ -34,8 +34,8 @@ esac
# convert into absolute path
-cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`/../..
-auto_build_root_dir=`pwd`
+cd $(echo $0 | sed 's|\(.*\)/.*$|\1|')/../..
+auto_build_root_dir=$(pwd)
echo "root: $auto_build_root_dir"
# let rsync handle the cleanup with --delete
@@ -59,16 +59,18 @@ upload_build ()
echo "upload specs $1 $2 $3"
echo "Uploading $archive"
- upload_filename=`ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"`
+ upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|")
case $SYSTEM in
mingw*)
test -e ${archive} && /c/cygwin/bin/sh -c \
"rsync -a ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" &&\
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
*)
test -e ${archive} && rsync -a ${archive} \
rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
esac
diff --git a/scripts/auto-build/prep-auto-build-upload b/scripts/auto-build/prep-auto-build-upload
index fc086428..8cbc4b67 100755
--- a/scripts/auto-build/prep-auto-build-upload
+++ b/scripts/auto-build/prep-auto-build-upload
@@ -2,11 +2,11 @@
# prepare a directory per date for the auto-builders to upload to
-HOSTNAME=`hostname`
-SYSTEM=`uname -s`
-DATE=`date +%Y-%m-%d`
-TIME=`date +%H.%M.%S`
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+HOSTNAME=$(hostname)
+SYSTEM=$(uname -s)
+DATE=$(date +%Y-%m-%d)
+TIME=$(date +%H.%M.%S)
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt
#BUILD_ROOT="/var/www/auto-build"
diff --git a/scripts/auto-build/pure-data-rsync b/scripts/auto-build/pure-data-rsync
index 96889a52..9fed6bcc 100755
--- a/scripts/auto-build/pure-data-rsync
+++ b/scripts/auto-build/pure-data-rsync
@@ -2,11 +2,11 @@
# rsync the CVS source files from SourceForge to make a local copy
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt
diff --git a/scripts/auto-build/pure-data-rsync-checkout b/scripts/auto-build/pure-data-rsync-checkout
index 7d15adec..b34c44b3 100755
--- a/scripts/auto-build/pure-data-rsync-checkout
+++ b/scripts/auto-build/pure-data-rsync-checkout
@@ -2,11 +2,11 @@
# update from the local CVS repository
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
LOGFILE=/home/pd/logs/${DATE}_${TIME}_-_${SCRIPT}_-_${SYSTEM}.txt
update_distro ()
@@ -21,7 +21,7 @@ update_distro ()
touch $LOGFILE
for dir in /home/pd/rsync/*; do
- dirname=`echo $dir | sed 's|.*/\(.*\)|\1|'`
+ dirname=$(echo $dir | sed 's|.*/\(.*\)|\1|')
test -e $dir/scripts/update-developer-layout.sh && \
update_distro $dirname
done
diff --git a/scripts/auto-build/run-automated-builder b/scripts/auto-build/run-automated-builder
index f96608c6..1c4b5f3b 100755
--- a/scripts/auto-build/run-automated-builder
+++ b/scripts/auto-build/run-automated-builder
@@ -8,11 +8,11 @@ PATH="${PATH}:/sw/bin:/sw/sbin"
export PATH
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
mailbody_on_failure () {
## this is a somewhat simplistic expression to detect error-lines
@@ -27,7 +27,7 @@ run_build_script ()
{
distro=$1
- ## LATER: make the uploaded ${LOGFILE} (name) be consistent with the uploaded package-file (name)
+ ## LATER: make the uploaded ${LOGFILE} (name) be consistent with the uploaded package-file (name)
LOGFILE=${HOME}/logs/${DATE}_${TIME}_${SYSTEM}_${HOSTNAME}_${distro}_${SCRIPT}.txt
touch ${LOGFILE}
@@ -44,7 +44,7 @@ run_build_script ()
esac
# send status report if something failed
- completion_test=`tail -1 ${LOGFILE}`
+ completion_test=$(tail -1 ${LOGFILE})
if [ "x${completion_test}" != "xSUCCESS" ]; then
if [ "x${RECIPIENT}" != "x" ]; then
SUBJECT="autobuild: $distro $HOSTNAME $DATE $TIME"
@@ -55,7 +55,7 @@ run_build_script ()
}
for dir in ${HOME}/auto-build/*; do
- dirname=`echo $dir | sed 's|.*/\(.*\)|\1|'`
+ dirname=$(echo $dir | sed 's|.*/\(.*\)|\1|')
test -e $dir/scripts/auto-build/${dirname}-auto-builder.sh && \
run_build_script $dirname
done
diff --git a/scripts/auto-build/tcltk_core-8-4-branch_auto-builder.sh b/scripts/auto-build/tcltk_core-8-4-branch_auto-builder.sh
index 64b3c158..0b05743b 100755
--- a/scripts/auto-build/tcltk_core-8-4-branch_auto-builder.sh
+++ b/scripts/auto-build/tcltk_core-8-4-branch_auto-builder.sh
@@ -2,16 +2,16 @@
# this script is the first attempt to have an automated updater and builder
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
# convert into absolute path
-cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`
-auto_build_root_dir=`pwd`
+cd $(echo $0 | sed 's|\(.*\)/.*$|\1|')
+auto_build_root_dir=$(pwd)
echo "root: $auto_build_root_dir"
# let rsync handle the cleanup with --delete
@@ -63,16 +63,18 @@ upload_build ()
echo "upload specs $1 $2 $3"
echo "Uploading $archive"
- upload_filename=`ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"`
+ upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|")
case $SYSTEM in
mingw*)
test -e ${archive} && /c/cygwin/bin/sh -c \
"rsync -a ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" &&\
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
*)
test -e ${archive} && rsync -a ${archive} \
rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
esac
diff --git a/scripts/auto-build/tcltk_core-8-5-branch_auto-builder.sh b/scripts/auto-build/tcltk_core-8-5-branch_auto-builder.sh
index 15add4b3..f4cc7852 100755
--- a/scripts/auto-build/tcltk_core-8-5-branch_auto-builder.sh
+++ b/scripts/auto-build/tcltk_core-8-5-branch_auto-builder.sh
@@ -2,16 +2,16 @@
# this script is the first attempt to have an automated updater and builder
# the source dir where this script is
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=$(echo $0 | sed 's|\(.*\)/.*$|\1|')
. $SCRIPT_DIR/auto-build-common
# the name of this script
-SCRIPT=`echo $0| sed 's|.*/\(.*\)|\1|g'`
+SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g')
# convert into absolute path
-cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`
-auto_build_root_dir=`pwd`
+cd $(echo $0 | sed 's|\(.*\)/.*$|\1|')
+auto_build_root_dir=$(pwd)
echo "root: $auto_build_root_dir"
# let rsync handle the cleanup with --delete
@@ -63,16 +63,18 @@ upload_build ()
echo "upload specs $1 $2 $3"
echo "Uploading $archive"
- upload_filename=`ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"`
+ upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|")
case $SYSTEM in
mingw*)
test -e ${archive} && /c/cygwin/bin/sh -c \
"rsync -a ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" &&\
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
*)
test -e ${archive} && rsync -a ${archive} \
rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \
+ echo "successfully uploaded: ${upload_filename}" && \
echo SUCCESS
;;
esac