Changeset 461


Ignore:
Timestamp:
Oct 24, 2012, 12:42:55 AM (8 years ago)
Author:
amain
Message:

bitten: add miggins patch and fix BASEDIR references

Location:
branches/contrib/bitten/slaves
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/bitten/slaves/bin/slave

    r459 r461  
    1717# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1818
    19 BASEDIR=$(readlink -f $(dirname $0))
    20 source ${BASEDIR}/../include/slaves.inc.sh
     19BASEDIR=$(readlink -f $(dirname $0))/../
     20source ${BASEDIR}/include/slaves.inc.sh
    2121
  • branches/contrib/bitten/slaves/bin/slave-cron

    r459 r461  
    4242echo "I: slave will build: ${dailybuilds_count} builds"
    4343
    44 cd ${BASEDIR}
    4544for i in $(seq 1 ${dailybuilds_count})
    4645do
  • branches/contrib/bitten/slaves/bin/slave-local

    r459 r461  
    2020# set some default vars
    2121
    22 BASEDIR=$(readlink -f $(dirname $0))
    23 source ${BASEDIR}/../include/slaves.inc.sh
     22BASEDIR=$(readlink -f $(dirname $0))/../
     23source ${BASEDIR}/include/slaves.inc.sh
    2424
  • branches/contrib/bitten/slaves/include/slaves.inc.sh

    r459 r461  
    1818# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1919
    20 set -x
    21 
    2220run=${1}
    2321ini=${2}
     
    2624if [ ! "${run}" = "run" ]
    2725then
    28   svn update ${BASEDIR}/../
    29   exec ${BASEDIR}/$(basename $0) run $@
     26  svn update ${BASEDIR}
     27  exec ${BASEDIR}/bin/$(basename $0) run $@
    3028else
    3129  shift
     
    6260       | while read dir
    6361         do
    64            sudo patch -N -p 1 -d ${dir} <${BASEDIR}/../patches/001_exit_no_pending.patch
     62           sudo patch -N -p 1 -d ${dir} <${BASEDIR}/patches/001_exit_no_pending.patch
     63           sudo patch -N -p 1 -d ${dir} <${BASEDIR}/patches/002_basedir_makedirs
    6564         done
    6665   fi
     
    6968[ ! -f "${ini}" ] && usage
    7069
    71 eval $(awk -f ${BASEDIR}/../include/ini.awk ${ini})
     70eval $(awk -f ${BASEDIR}/include/ini.awk ${ini})
    7271
    7372arch=${1/.*/}
Note: See TracChangeset for help on using the changeset viewer.