From 73c8c32f315a6a7c493479bbbb9c322d098e9076 Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Mon, 1 Dec 2008 18:57:43 -0600 Subject: Remove slashes from end of config paths Clean up output so that we don't get double slashes FS#12241 Signed-off-by: Aaron Griffin --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config b/config index 35fe446..b6b236a 100644 --- a/config +++ b/config @@ -1,5 +1,5 @@ -FTP_BASE="/srv/ftp/" +FTP_BASE="/srv/ftp" SVN_PATH="file:///srv/svn-packages" -STAGING="$HOME/staging/" +STAGING="$HOME/staging" TMPDIR="/srv/tmp" -- cgit v1.2.3-24-g4f1b From 1f48eaf35eecd0b35208d29d6fe6c0a8af7796df Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 1 Dec 2008 19:02:09 -0600 Subject: Do not touch db file if it doesn't exist repo-add works fine if no db file exists Signed-off-by: Aaron Griffin --- db-update | 2 -- 1 file changed, 2 deletions(-) diff --git a/db-update b/db-update index 1d2efa2..0c2d1fe 100755 --- a/db-update +++ b/db-update @@ -74,8 +74,6 @@ cd "$WORKDIR" # copy the db file into our working area if [ -f "$ftppath/$reponame.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath/$reponame.db.tar.$DB_COMPRESSION" build/ -else - touch "build/$reponame.db.tar.$DB_COMPRESSION" fi echo "Updating DB for $reponame $_arch" -- cgit v1.2.3-24-g4f1b From 87d3436dbd6fe5f3aeb7880d1596aa7a5c6e7905 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 1 Dec 2008 19:03:03 -0600 Subject: Cleanup missing db file logic Do not touch missing db files. Additionally, no need to call db-remove if the db file doesn't exist Signed-off-by: Aaron Griffin --- db-move | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/db-move b/db-move index 0e0587c..7fab215 100755 --- a/db-move +++ b/db-move @@ -84,19 +84,14 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then # copy the db file into our working area if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" . - else - touch "$repofrom.db.tar.$DB_COMPRESSION" + /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" + #use '*' to move the old DB too + mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from + echo " Package files will be cleaned up automatically" fi - /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" - #use '*' to move the old DB too - mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from - echo " Package files will be cleaned up automatically" - if [ -f "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" . - else - touch "$repoto.db.tar.$DB_COMPRESSION" fi /bin/cp "$ftppath_from/$_pkgfile" . -- cgit v1.2.3-24-g4f1b From 179acc5b66a610a4e9bf584e1b613b886e12cec0 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 12 Dec 2008 00:03:52 -0600 Subject: Add potential BUILDSCRIPT config setting This may get removed from makepkg.conf in the future, so let's make sure we cover our ass Signed-off-by: Aaron Griffin --- config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config b/config index b6b236a..5c39919 100644 --- a/config +++ b/config @@ -3,3 +3,5 @@ FTP_BASE="/srv/ftp" SVN_PATH="file:///srv/svn-packages" STAGING="$HOME/staging" TMPDIR="/srv/tmp" +# To be used if $BUILDSCRIPT is removed from makepkg.conf +#BUILDSCRIPT="PKGBUILD" -- cgit v1.2.3-24-g4f1b From 123e7560e49e04f9fdd552f9dc47bcedea2ea128 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 12 Dec 2008 00:14:39 -0600 Subject: Quiet down repo-add just a bit This assumes the -q flag patch is accepted for pacman 8) Signed-off-by: Aaron Griffin --- db-move | 4 ++-- db-remove | 2 +- db-update | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db-move b/db-move index 7fab215..ff9677b 100755 --- a/db-move +++ b/db-move @@ -84,7 +84,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then # copy the db file into our working area if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" . - /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" + /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" #use '*' to move the old DB too mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from echo " Package files will be cleaned up automatically" @@ -95,7 +95,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then fi /bin/cp "$ftppath_from/$_pkgfile" . - /usr/bin/repo-add "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add" + /usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add" #use '*' to move the old DB too mv $repoto.db.tar.$DB_COMPRESSION* $_pkgfile $ftppath_to else diff --git a/db-remove b/db-remove index c5b6819..acc849d 100755 --- a/db-remove +++ b/db-remove @@ -74,7 +74,7 @@ fi echo " Removing from $reponame DB file" cd build/ -/usr/bin/repo-remove "$reponame.db.tar.$DB_COMPRESSION" $packagename +/usr/bin/repo-remove -q "$reponame.db.tar.$DB_COMPRESSION" $packagename /bin/cp "$reponame.db.tar.$DB_COMPRESSION" "$ftppath/" diff --git a/db-update b/db-update index 0c2d1fe..40c5539 100755 --- a/db-update +++ b/db-update @@ -142,7 +142,7 @@ if [ -n "$ADDPKGS" ]; then pkgs="" for pkg in $to_add; do pkgs="$pkgs $(basename $pkg)"; done - /usr/bin/repo-add "$reponame.db.tar.$DB_COMPRESSION" $pkgs + /usr/bin/repo-add -q "$reponame.db.tar.$DB_COMPRESSION" $pkgs else rm -f "build/$reponame.db.tar.$DB_COMPRESSION" echo "Errors found when adding packages" -- cgit v1.2.3-24-g4f1b From b0e7b12ed43b6614b6c32f1678edf53f1c668513 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 16 Dec 2008 08:50:53 -0800 Subject: Only remove packages that were successfully added This prevents some errors where packages where removed from the staging dir when they shouldn't have been. Original-idea-by: Pierre Schmitz Signed-off-by: Aaron Griffin --- db-update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db-update b/db-update index 40c5539..2a9dd6e 100755 --- a/db-update +++ b/db-update @@ -164,9 +164,9 @@ else echo "Nothing to copy, no work done" fi -if [ -n "$ADDPKGS" ]; then +if [ -n "$to_add" ]; then echo "Cleaning staging dir" - /bin/rm $ADDPKGS + /bin/rm $to_add fi cleanup -- cgit v1.2.3-24-g4f1b From 1c30298885f581f3bf3731576374da7044973747 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 29 Dec 2008 11:42:07 -0800 Subject: Fix sourceball generation to work with conf file Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 0006092..7a02abf 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -13,10 +13,7 @@ packagename="$1" reponame="$2" arch="$3" -##### Arch specific stuff. TODO make this configurable ##### -srcpath="/srv/ftp/sources/" -svnpath="file:///srv/svn-packages/$packagename/" -############################################################ +srcpath="$FTP_BASE/sources/" WORKDIR="/tmp/make-sourceball.$packagename.$UID" @@ -73,7 +70,7 @@ cd "$WORKDIR" echo "Creating Source tarball for $packagename ($reponame-$arch)" -if /usr/bin/svn export -q "$svnpath/repos/$reponame-$arch" $packagename; then +if /usr/bin/svn export -q "$SVN_PATH/repos/$reponame-$arch" $packagename; then create_srcpackage "$packagename" if [ $? -eq 0 ]; then exit 0 @@ -81,7 +78,7 @@ if /usr/bin/svn export -q "$svnpath/repos/$reponame-$arch" $packagename; then #trunk sometimes has updated URLs echo ":: Failed to download source, attempting trunk build" rm -rf "$packagename" - if /usr/bin/svn export -q "$svnpath/trunk" "$packagename"; then + if /usr/bin/svn export -q "$SVN_PATH/trunk" "$packagename"; then create_srcpackage "$packagename" if [ $? -eq 0 ]; then echo ":: Source package complete: $pkg_file" -- cgit v1.2.3-24-g4f1b From f0d817a0deb150f576ee7733f5be40bd981f81cf Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 29 Dec 2008 13:26:02 -0800 Subject: Misc make-sourceball fixes and updates * --allsource places packages in dirs with the pkgname * Syntax errors with if statement and globbing * Set and restore umask Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 7a02abf..44c3815 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -18,7 +18,7 @@ srcpath="$FTP_BASE/sources/" WORKDIR="/tmp/make-sourceball.$packagename.$UID" cleanup() { - # unlock + restore_umask rm -rf "$WORKDIR" [ "$1" ] && exit $1 } @@ -50,13 +50,13 @@ create_srcpackage() { mkdir -p "$srcpath" fi #Remove old sourceballs - for pkg in "$srcpath/$pkgname-*"; do + for pkg in "$srcpath/$pkgname-"*; do pkg="$(basename $pkg)" - if "$(getpkgname $pkg)" == "$pkgname" ]; then + if [ "$(getpkgname $pkg)" == "$pkgname" ]; then rm -f "$srcpath/$pkg" fi done - cp $pkg_file "$srcpath" + cp "$pkgname/$pkg_file" "$srcpath" return 0 fi @@ -65,6 +65,7 @@ create_srcpackage() { trap ctrl_c 2 trap cleanup 0 1 +set_umask /bin/mkdir -p "$WORKDIR" cd "$WORKDIR" -- cgit v1.2.3-24-g4f1b From 81efd3d8cd39d07930b18dcd8f904153500bfbf3 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 29 Dec 2008 13:30:00 -0800 Subject: Allow devlist-mailer to send to alternate addresses Signed-off-by: Aaron Griffin --- cron-jobs/devlist-mailer | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cron-jobs/devlist-mailer b/cron-jobs/devlist-mailer index b24d530..671cbbb 100755 --- a/cron-jobs/devlist-mailer +++ b/cron-jobs/devlist-mailer @@ -7,8 +7,12 @@ LIST="arch-dev-public@archlinux.org" FROM="repomaint@archlinux.org" SUBJECT="Repository Maintenance $(date +"%d-%m-%Y %H:%M")" -if [ $# -eq 1 ]; then - SUBJECT="$1" +if [ $# -ge 1 ]; then + SUBJECT="$1 $(date +"%d-%m-%Y %H:%M")" +fi + +if [ $# -ge 2 ]; then + LIST="$2" fi stdin="$(cat)" -- cgit v1.2.3-24-g4f1b From 830f8f87e1ede09a8c827c1a93aa4ed5db66f0b6 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 29 Dec 2008 13:31:33 -0800 Subject: Remove an if check for old staging 'add' dirs Signed-off-by: Aaron Griffin --- db-update | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/db-update b/db-update index 2a9dd6e..254a6f9 100755 --- a/db-update +++ b/db-update @@ -95,9 +95,7 @@ if [ -d "${stagedir}/add" ]; then echo "Please delete staging//{add,del}" echo " and ensure you are using the newest devtools" echo "--------------------------------------------------" - if [ -e "${stagedir}/add/"* ]; then - /bin/mv "${stagedir}/add/"* "$stagedir/" - fi + /bin/mv "${stagedir}/add/"* "$stagedir/" fi to_add="" -- cgit v1.2.3-24-g4f1b From d39b68ede8567fb2ee15f45995ddab8f4710e9dc Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Sat, 3 Jan 2009 13:22:57 +0100 Subject: check_packages : add --arch option. The parsing script didn't set CARCH previously, and the flashplugin PKGBUILD exited in this case. First override the exit function to prevent the whole script to exit, and add a --arch option to be able to set CARCH correctly. To be used like this : For core and extra : ./check_packages.py --abs-tree=/home/abs/rsync/i686 --repos=core,extra --arch=i686 ./check_packages.py --abs-tree=/home/abs/rsync/x86_64 --repos=core,extra --arch=x86_64 For community : ./check_packages.py --abs-tree=/home/abs/rsync/i686 --repos=community --arch=i686 ./check_packages.py --abs-tree=/home/abs/rsync/x86_64 --repos=community --arch=x86_64 Signed-off-by: Xavier Chantry Signed-off-by: Aaron Griffin --- cron-jobs/check_archlinux/check_packages.py | 23 ++++++++++++++--------- cron-jobs/check_archlinux/parse_pkgbuilds.sh | 9 ++++++++- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/cron-jobs/check_archlinux/check_packages.py b/cron-jobs/check_archlinux/check_packages.py index 69b14c3..f0fd4a5 100755 --- a/cron-jobs/check_archlinux/check_packages.py +++ b/cron-jobs/check_archlinux/check_packages.py @@ -49,11 +49,11 @@ class Depend: self.version = version self.mod = mod -def parse_pkgbuilds(repos): +def parse_pkgbuilds(repos,arch): oldcwd = os.getcwd() os.chdir(absroot) for repo in repos: - data = commands.getoutput(oldcwd + '/parse_pkgbuilds.sh ' + repo) + data = commands.getoutput(oldcwd + '/parse_pkgbuilds.sh ' + arch + ' ' + repo) parse_data(repo,data) os.chdir(oldcwd) @@ -292,24 +292,27 @@ def print_usage(): print "Usage: ./check_packages.py [OPTION]" print "" print "Options:" - print " --abs-tree= Check specified tree (default : /var/abs)" - print " --repos= Check specified repos (default : core,extra)" + print " --abs-tree= Check the specified tree (default : /var/abs)" + print " --repos= Check the specified repos (default : core,extra)" + print " --arch= Check the specified arch (default : i686)" print " -h, --help Show this help and exit" print "" print "Examples:" print "\n Check core and extra in existing abs tree:" - print " ./check_packages.py --abs-tree=/var/abs --repos=core,extra" + print " ./check_packages.py --abs-tree=/var/abs --repos=core,extra --arch=i686" print "\n Check community:" - print " ./check_packages.py --abs-tree=/var/abs --repos=community" + print " ./check_packages.py --abs-tree=/var/abs --repos=community --arch=i686" print "" ## Default path to the abs root directory absroot = "/var/abs" ## Default list of repos to check repos = ['core', 'extra'] +## Default arch +arch = "i686" try: - opts, args = getopt.getopt(sys.argv[1:], "", ["abs-tree=", "repos="]) + opts, args = getopt.getopt(sys.argv[1:], "", ["abs-tree=", "repos=", "arch="]) except getopt.GetoptError: print_usage() sys.exit() @@ -319,6 +322,8 @@ if opts != []: absroot = a elif o in ("--repos"): repos = a.split(",") + elif o in ("--arch"): + arch = a else: print_usage() sys.exit() @@ -339,11 +344,11 @@ loadrepos = set([]) for repo in repos: loadrepos = loadrepos | set(get_repo_hierarchy(repo)) -print_heading("Integrity Check") +print_heading("Integrity Check " + arch + " of " + ",".join(repos)) print "\nPerforming integrity checks..." print "==> parsing pkgbuilds" -parse_pkgbuilds(loadrepos) +parse_pkgbuilds(loadrepos,arch) repopkgs = {} for name,pkg in packages.iteritems(): diff --git a/cron-jobs/check_archlinux/parse_pkgbuilds.sh b/cron-jobs/check_archlinux/parse_pkgbuilds.sh index d4205ae..47aec89 100755 --- a/cron-jobs/check_archlinux/parse_pkgbuilds.sh +++ b/cron-jobs/check_archlinux/parse_pkgbuilds.sh @@ -1,5 +1,10 @@ #!/bin/bash +# Usage : parse_pkgbuilds.sh arch +# Example : parse_pkgbuilds.sh i686 /var/abs/core /var/abs/extra + +exit() { return; } + parse() { unset pkgname pkgver pkgrel unset depends makedepends conflicts provides @@ -67,10 +72,12 @@ find_pkgbuilds() { fi } -if [ -z "$*" ]; then +if [ -z "$1" -o -z "$2" ]; then exit 1 fi +CARCH=$1 +shift for dir in "$@"; do find_pkgbuilds $dir done -- cgit v1.2.3-24-g4f1b From 34dc23953ecf218cf263bf150ecb019dee36983d Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 9 Jan 2009 18:13:41 -0500 Subject: Add support for altername BASEDIRs in db-functions This is needed because we do lots of things via relative paths, and scripts in the misc-scripts dir may need some of these functions too Signed-off-by: Aaron Griffin --- db-functions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db-functions b/db-functions index b196d57..a2e2f72 100644 --- a/db-functions +++ b/db-functions @@ -3,7 +3,10 @@ # Random integrity things [ "$UID" = "" ] && UID=$(uid) -BASEDIR="$(dirname $0)" +if [ -z "$BASEDIR" ]; then + BASEDIR="$(dirname $0)" +fi + if [ -f "$BASEDIR/config" ]; then . "$BASEDIR/config" fi -- cgit v1.2.3-24-g4f1b From 671f36cb092ac5b8c8c30f53c19c05b8249bdee0 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 9 Jan 2009 18:14:49 -0500 Subject: Use new BASEDIR facility in make-sourceball Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 44c3815..c02a84d 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -5,7 +5,8 @@ if [ $# -ne 3 ]; then exit 1 fi -. "$(dirname $0)/../db-functions" +BASEDIR="$(dirname $0)/../" +. "$BASEDIR/db-functions" source_makepkg @@ -71,7 +72,7 @@ cd "$WORKDIR" echo "Creating Source tarball for $packagename ($reponame-$arch)" -if /usr/bin/svn export -q "$SVN_PATH/repos/$reponame-$arch" $packagename; then +if /usr/bin/svn export -q "$SVN_PATH/$packagename/repos/$reponame-$arch" $packagename; then create_srcpackage "$packagename" if [ $? -eq 0 ]; then exit 0 @@ -79,7 +80,7 @@ if /usr/bin/svn export -q "$SVN_PATH/repos/$reponame-$arch" $packagename; then #trunk sometimes has updated URLs echo ":: Failed to download source, attempting trunk build" rm -rf "$packagename" - if /usr/bin/svn export -q "$SVN_PATH/trunk" "$packagename"; then + if /usr/bin/svn export -q "$SVN_PATH/$packagename/trunk" "$packagename"; then create_srcpackage "$packagename" if [ $? -eq 0 ]; then echo ":: Source package complete: $pkg_file" -- cgit v1.2.3-24-g4f1b From a3fc31dc16b442bf492ab52f9c48d4ea230878d8 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 12 Jan 2009 17:02:53 -0500 Subject: Add license checking to make-sourceball Confirm that the license of a package requires source distribution before building the source tarball TODO: Make sure we can skip this check somehow Signed-off-by: Aaron Griffin --- misc-scripts/make-sourceball | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index c02a84d..91dc122 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -1,5 +1,8 @@ #!/bin/bash +# Allowed licenses: build only for licenses in this array +ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2') + if [ $# -ne 3 ]; then echo "usage: $(basename $0) " exit 1 @@ -34,10 +37,32 @@ die() { cleanup 1 } +#usage: chk_license ${license[@]}" +chk_license() { + local l + for l in "$@"; do + l="$(echo $l | tr '[:upper:]' '[:lower:]')" + for allowed in ${ALLOWED_LICENSES[@]}; do + allowed="$(echo $allowed | tr '[:upper:]' '[:lower:]')" + if [ "$l" = "$allowed" ]; then + return 0 + fi + done + done + + return 1 +} + create_srcpackage() { if [ -d "$1" ]; then pushd "$1" >/dev/null . "$BUILDSCRIPT" + if ! chk_license ${license[@]}; then + echo "Package license does not require source tarballs. Doing nothing" + echo " license => (${license[@]})" + cleanup 0 + fi + if ! /usr/bin/makepkg --allsource >/dev/null 2>&1; then popd >/dev/null return 1 -- cgit v1.2.3-24-g4f1b From 5f64e9993a494040b0280ed0f1daa38f68f9c46b Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 14 Jan 2009 13:31:11 -0800 Subject: Remove HH:MM from devlist-mailer subject lines This was extraneous info. Not needed as higher granularity can be gleaned from the mail's date Signed-off-by: Aaron Griffin --- cron-jobs/devlist-mailer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cron-jobs/devlist-mailer b/cron-jobs/devlist-mailer index 671cbbb..ca2e46b 100755 --- a/cron-jobs/devlist-mailer +++ b/cron-jobs/devlist-mailer @@ -6,9 +6,9 @@ LIST="arch-dev-public@archlinux.org" #LIST="aaronmgriffin@gmail.com" FROM="repomaint@archlinux.org" -SUBJECT="Repository Maintenance $(date +"%d-%m-%Y %H:%M")" +SUBJECT="Repository Maintenance $(date +"%d-%m-%Y")" if [ $# -ge 1 ]; then - SUBJECT="$1 $(date +"%d-%m-%Y %H:%M")" + SUBJECT="$1 $(date +"%d-%m-%Y")" fi if [ $# -ge 2 ]; then -- cgit v1.2.3-24-g4f1b