From 8f28ee2e2fc539e67627584a999e1a45e77847dc Mon Sep 17 00:00:00 2001
From: Andrea Zagli <andrea.zagli@email.it>
Date: Thu, 30 Mar 2017 12:27:53 +0200
Subject: [PATCH] =?utf8?q?Autobuilder:=20aggiunta=20la=20possibilit=C3=A0?=
=?utf8?q?=20di=20specificare=20i=20comandi=20per=20copiare=20i=20file=20e?=
=?utf8?q?=20aggiungerli=20al=20repo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
tools/autobuilder/copy_to_repo.sh | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/tools/autobuilder/copy_to_repo.sh b/tools/autobuilder/copy_to_repo.sh
index c9b7aa9..063b10e 100644
--- a/tools/autobuilder/copy_to_repo.sh
+++ b/tools/autobuilder/copy_to_repo.sh
@@ -2,15 +2,19 @@
CUR=$PWD
FROM=.
-REPO=/opt/msys2/repositories/saetta/
+CMD_COPY_TO_REPO="cp -f <pkgsfilename> /opt/msys2/repositories/saetta"
+CMD_ADD_TO_REPO="cd /opt/msys2/repositories/saetta && ./repo-add saetta.db.tar.gz <pkgsfilename>"
-while getopts ":f:t:" opt; do
+while getopts ":f:c:a:" opt; do
case $opt in
f)
FROM=$OPTARG
;;
- t)
- REPO=$OPTARG
+ c)
+ CMD_COPY_TO_REPO=$OPTARG
+ ;;
+ a)
+ CMD_ADD_TO_REPO=$OPTARG
;;
\?)
echo "Invalid option: -$OPTARG" >&2
@@ -24,10 +28,8 @@ while getopts ":f:t:" opt; do
done
echo "From: "$FROM
-echo "Repo: "$REPO
if [ ! -d $FROM ]; then echo $FROM" isn't a directory" && exit 0; fi
-if [ ! -d $REPO ]; then echo $REPO" isn't a directory" && exit 0; fi
cd $FROM
if [ ! -e PKGBUILD ]; then "No PKGBUILD file found in "$FROM && exit 0; fi
@@ -47,10 +49,14 @@ echo "pkgrel: "$pkgrel
pkgfilename32="mingw-w64-i686-"$realname"-"$pkgver"-"$pkgrel"-any.pkg.tar.xz"
pkgfilename64="mingw-w64-x86_64-"$realname"-"$pkgver"-"$pkgrel"-any.pkg.tar.xz"
-cp -f $pkgfilename32 $REPO
-cp -f $pkgfilename64 $REPO
+if [ -e ~/.zak_msys2_copy_to_repo ]; then . ~/.zak_msys2_copy_to_repo; fi
+
+CMD_COPY_TO_REPO=${CMD_COPY_TO_REPO/"<pkgsfilename>"/"$pkgfilename32 $pkgfilename64"}
+CMD_ADD_TO_REPO=${CMD_ADD_TO_REPO/"<pkgsfilename>"/"$pkgfilename32 $pkgfilename64"}
+
+echo "Command copy to report: "$CMD_COPY_TO_REPO
+echo "Command add to report: "$CMD_ADD_TO_REPO
-cd $REPO
-./repo-add saetta.db.tar.gz $pkgfilename32 $pkgfilename64
+$CMD_COPY_TO_REPO
-cd $CUR
+$CMD_ADD_TO_REPO
--
2.49.0