From 6bd358282ae7b63b3bf5f75da6c922e638fefbcd Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 29 Jul 2014 21:30:39 +0100 Subject: Move the --dry-run handling into the functions file. --- functions | 7 +++++++ mga-hdlists | 5 ----- mga-hdlists-backports | 5 ----- mga-hdlists-cauldron | 5 ----- mga-hdlists-updates | 5 ----- mga-move-pkg | 5 ----- 6 files changed, 7 insertions(+), 25 deletions(-) diff --git a/functions b/functions index 992157f..26fc6db 100644 --- a/functions +++ b/functions @@ -16,6 +16,13 @@ mirror_rsync_options="--dry-run -v --delete -alH" [ -f /etc/mgatools.conf ] && . /etc/mgatools.conf +# Generic support for --dry-run as first argument +if [ "$1" = "--dry-run" ]; then + dryrun=echo + mirror_rsync_options="--dry-run -v --delete -alH" + shift +fi + function isingroup() { grp="$1" diff --git a/mga-hdlists b/mga-hdlists index 37dc31d..da09a2e 100755 --- a/mga-hdlists +++ b/mga-hdlists @@ -9,11 +9,6 @@ else . /usr/share/mgatools/functions fi -if [ "$1" = "--dry-run" ]; then - dryrun=echo - shift -fi - if [ $# != 3 ]; then echo "Usage: $0 [--dry-run]
" >&2 exit 1 diff --git a/mga-hdlists-backports b/mga-hdlists-backports index 9137aa0..767c331 100755 --- a/mga-hdlists-backports +++ b/mga-hdlists-backports @@ -9,11 +9,6 @@ else . /usr/share/mgatools/functions fi -if [ "$1" = "--dry-run" ]; then - dryrun=echo - shift -fi - if [ $# != 2 ]; then echo "Usage: $0 [--dry-run]
" >&2 exit 1 diff --git a/mga-hdlists-cauldron b/mga-hdlists-cauldron index ca85344..dfa4ca4 100755 --- a/mga-hdlists-cauldron +++ b/mga-hdlists-cauldron @@ -9,11 +9,6 @@ else . /usr/share/mgatools/functions fi -if [ "$1" = "--dry-run" ]; then - dryrun=echo - shift -fi - if [ $# != 2 ]; then echo "Usage: $0 [--dry-run]
" >&2 exit 1 diff --git a/mga-hdlists-updates b/mga-hdlists-updates index ee2f71f..9d12a45 100755 --- a/mga-hdlists-updates +++ b/mga-hdlists-updates @@ -9,11 +9,6 @@ else . /usr/share/mgatools/functions fi -if [ "$1" = "--dry-run" ]; then - dryrun=echo - shift -fi - if [ $# != 2 ]; then echo "Usage: $0 [--dry-run]
" >&2 exit 1 diff --git a/mga-move-pkg b/mga-move-pkg index b757ba9..beaf99e 100755 --- a/mga-move-pkg +++ b/mga-move-pkg @@ -9,11 +9,6 @@ else . /usr/share/mgatools/functions fi -if [ "$1" = "--dry-run" ]; then - dryrun=echo - shift -fi - sync= if [ "$1" = "--sync" ]; then sync=yes -- cgit v1.2.1