Untabiffy

This commit is contained in:
Laurent Rineau 2018-09-03 16:29:43 +02:00
parent 6870ddd8ef
commit f09c4ffe4e
1 changed files with 18 additions and 18 deletions

View File

@ -47,8 +47,8 @@ usage() {
printerr ' --verbose : print log to standard output, instead of the log file' printerr ' --verbose : print log to standard output, instead of the log file'
printerr ' --beta <n> : followed by a number. When used with --public, will modify printerr ' --beta <n> : followed by a number. When used with --public, will modify
the release number and the release version name to include beta<n>' the release number and the release version name to include beta<n>'
printerr ' --dest : followed by the path to where the release should be created. Default is /tmp.' printerr ' --dest : followed by the path to where the release should be created. Default is /tmp.'
printerr ' --is_master : replace the Ic in the name by I.' printerr ' --is_master : replace the Ic in the name by I.'
printerr ' <packages dir> : the directory containing the packages [default is trunk]' printerr ' <packages dir> : the directory containing the packages [default is trunk]'
} }
@ -98,15 +98,15 @@ while [ $1 ]; do
shift; shift;
continue continue
;; ;;
--dest) --dest)
shift shift
DESTINATION=$1 DESTINATION=$1
shift;continue shift;continue
;; ;;
--is_master) --is_master)
IS_MASTER="y" IS_MASTER="y"
shift;continue shift;continue
;; ;;
-*) -*)
printerr "Unrecognized option : $1" printerr "Unrecognized option : $1"
exit exit
@ -230,12 +230,12 @@ fi
function cleanup() { function cleanup() {
# Remove local directory and tarball # Remove local directory and tarball
if [ -d ${release_name} ]; then if [ -d ${release_name} ]; then
rm -rf ./"${release_name}" rm -rf ./"${release_name}"
fi fi
if [ -f ${release_name}.tar.gz ]; then if [ -f ${release_name}.tar.gz ]; then
rm ${release_name}.tar.gz rm ${release_name}.tar.gz
fi fi
if [ -n "$DO_PUBLIC" ]; then if [ -n "$DO_PUBLIC" ]; then
[ -d "${public_release_name}" ] && rm -rf ./"${public_release_name}" [ -d "${public_release_name}" ] && rm -rf ./"${public_release_name}"
rm -rf doc rm -rf doc
@ -290,11 +290,11 @@ if [ -n "$DO_PUBLIC" ]; then
fi fi
public_release_version="${MAJOR_NUMBER}.${MINOR_NUMBER}${BUGFIX_STRING}" public_release_version="${MAJOR_NUMBER}.${MINOR_NUMBER}${BUGFIX_STRING}"
if [ -n "$BETA" ]; then if [ -n "$BETA" ]; then
public_release_name="CGAL-${public_release_version}-beta${BETA}" public_release_name="CGAL-${public_release_version}-beta${BETA}"
elif [ -r "${NUMBERS_DIR}/public_release_name" ]; then elif [ -r "${NUMBERS_DIR}/public_release_name" ]; then
public_release_name=`cat "${NUMBERS_DIR}/public_release_name"` public_release_name=`cat "${NUMBERS_DIR}/public_release_name"`
else else
public_release_name="CGAL-${public_release_version}" public_release_name="CGAL-${public_release_version}"
fi fi
mv -T ${release_name} $public_release_name mv -T ${release_name} $public_release_name