Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
58d61d51e3 | |||
b59c024914 | |||
82c5f79f27 | |||
5241fa7e82 | |||
a89e2b9a13 |
25
autodist
25
autodist
@ -5,14 +5,14 @@
|
||||
#
|
||||
# Released under the terms of the GNU GPL release 3 license
|
||||
#
|
||||
VERSION=0.9.14
|
||||
VERSION=0.9.15
|
||||
me=(${0##*/} $VERSION "Sat Aug 20 2010")
|
||||
exec 3>`readlink /proc/self/fd/0`
|
||||
|
||||
function usage() {
|
||||
echo "\
|
||||
${me[0]} ${me[1]}
|
||||
"$"Copyright (C) 2006-2012 Silvan Calarco <silvan.calarco@mambasoft.it>""
|
||||
"$"Copyright (C) 2006-2014 Silvan Calarco <silvan.calarco@mambasoft.it>""
|
||||
"$"Released under the terms of the GNU GPL v3 license"
|
||||
echo "
|
||||
"$"Batch build tool for bulding a whole distribution and much more.""
|
||||
@ -198,8 +198,9 @@ for ((i=1; i<=$#; i++)); do
|
||||
fi
|
||||
;;
|
||||
*) if [ "$AUTOSPEC_ARGS_MODE" != "1" ]; then
|
||||
JOBNAME[${#JOBNAME[@]}]="${!i/\#*}"
|
||||
[ "${!i/*\#}" != "${!i}" ] && JOBVER[${#JOBNAME[@]}]="+${!i/*\#}"
|
||||
JOBIDX=${#JOBNAME[@]}
|
||||
JOBNAME[$JOBIDX]="${!i/\#*}"
|
||||
[ "${!i/*\#}" != "${!i}" ] && JOBVER[$JOBIDX]="+${!i/*\#}"
|
||||
else
|
||||
if [ "${!i/ }" != "${!i}" ]; then
|
||||
# pass multiple word arguments inside quotation marks
|
||||
@ -494,7 +495,7 @@ function launch_pkgs_loop() {
|
||||
# launch loop for each package
|
||||
for pkg in ${JOB_PKGS[*]}; do
|
||||
|
||||
unset LOGFILE_SUFFIX
|
||||
unset LOGFILE_SUFFIX AUTOUPDATE_SCRIPT_ALREADY_RUN
|
||||
for a in ${JOB_VALUES[*]}; do
|
||||
tr_job=`echo $a | tr / _`
|
||||
LOGFILE_SUFFIX=${LOGFILE_SUFFIX}__$tr_job
|
||||
@ -604,7 +605,7 @@ function launch_pkgs_loop() {
|
||||
if [ "$PKGLINE" ]; then
|
||||
set -- $PKGLINE
|
||||
pkglinever=$2
|
||||
# warning: asasuming version is passed first
|
||||
# warning: assuming version is passed first
|
||||
version_find_bigger "${passed_arguments/ *}" "$pkglinever"
|
||||
[ $? -eq 1 ] || {
|
||||
echo "!! Warning: skipping ${pkg} package already up to date ($pkglinever >= ${passed_arguments/ *})."
|
||||
@ -614,6 +615,11 @@ function launch_pkgs_loop() {
|
||||
continue
|
||||
}
|
||||
fi
|
||||
if [ -e $source_dir/$pkg-autoupdate ]; then
|
||||
echo "?= Running $pkg-autoupdate script with version ${passed_arguments/ *}"
|
||||
(cd $source_dir; sh ./$pkg-autoupdate ${passed_arguments/ *} >/dev/null)
|
||||
AUTOUPDATE_SCRIPT_ALREADY_RUN=1
|
||||
fi
|
||||
command_opts="-a3:4" ;;
|
||||
build)
|
||||
# skip package in job if it is in the delayed repository
|
||||
@ -785,9 +791,10 @@ function launch_pkgs_loop() {
|
||||
}
|
||||
fi
|
||||
fi
|
||||
if [ "$2" != "$SPEC_VERSION" -a -e $source_dir/$pkg-autoupdate ]; then
|
||||
echo "?= Running autoupdate script with version $SPEC_VERSION"
|
||||
sh $source_dir/$pkg-autoupdate $SPEC_VERSION
|
||||
if [ "$2" != "$SPEC_VERSION" -a -e $source_dir/$pkg-autoupdate -a ! "$AUTOUPDATE_SCRIPT_ALREADY_RUN" ]; then
|
||||
echo "?= Running $pkg-autoupdate script with version ${passed_arguments/ *}"
|
||||
(cd $source_dir; sh ./$pkg-autoupdate ${passed_arguments/ *} >/dev/null)
|
||||
AUTOUPDATE_SCRIPT_ALREADY_RUN=1
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
2
autoport
2
autoport
@ -4,7 +4,7 @@
|
||||
#
|
||||
# Released under the terms of the GNU GPL release 3 license
|
||||
#
|
||||
VERSION=0.9.14
|
||||
VERSION=0.9.15
|
||||
|
||||
BASE_ARCH=i586
|
||||
BASE_REPOSITORY=devel
|
||||
|
@ -1042,6 +1042,7 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr
|
||||
--changelog \"package created using the webbuild interface\""
|
||||
RET=$?
|
||||
[ $RET -eq 0 ] && {
|
||||
eval `$SUDO_WRAPPER specinfo $ENVIRONMENT "$USER" $PACKAGE ""`
|
||||
social_log "SUSER=$USER SEMAIL=$USER_EMAIL STARGET=developers STEXT=\"is working on <b>$PACKAGE</b> new package in <b>`print_environment_descr $ENVIRONMENT`</b> environment\" STIME=`date +%s`"
|
||||
# prepare
|
||||
$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bp $PACKAGE.spec --nodeps --define=\"_topdir $SPECVAR_WORKINGHOME/RPM\""
|
||||
@ -1408,7 +1409,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
|
||||
echo -n "<br>"
|
||||
fi
|
||||
# automatic port
|
||||
if [ ! "${AUTOPORT_DISABLE[$ENVIRONMENT]}" -a ! "${AUTOPORT_UPDATE[$ENVIRONMENT]}" ]; then
|
||||
if [ "${AUTOPORT_PORT_REPOSITORY[$ENVIRONMENT]}" ]; then
|
||||
echo -n "Automatic port:"
|
||||
echo -n "<input type=button id=autoportnp value=\"port\" onclick="
|
||||
echo -n "p=getSelectedValueById('sendrepository');"
|
||||
@ -2253,5 +2254,5 @@ else
|
||||
echo -n ")"
|
||||
fi
|
||||
|
||||
echo -n " :: openmamba webbuild</title>"
|
||||
echo -n " :: openmamba webbuild @`hostname`</title>"
|
||||
echo "</webbuild>"
|
||||
|
@ -84,6 +84,7 @@ function showlog() {
|
||||
|
||||
function showEnvironmentPanel() {
|
||||
|
||||
echo -n "Build host: <b>`hostname`</b><br>"
|
||||
echo -n "Environment: <b>"
|
||||
if [ "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]}" ]; then
|
||||
echo -n "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]} - "
|
||||
|
Reference in New Issue
Block a user