diff options
| author | Dan McGee <dan@archlinux.org> | 2008-02-18 04:15:06 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-02-18 04:25:41 +0100 |
| commit | 355930654693b416725e170ad0cb14d0251626e4 (patch) | |
| tree | 8981df01d6518eb67f6e359e399b9b9465bf5e74 | |
| parent | 2374c81e55abc0f7252fad7eb53d2b75bb33f750 (diff) | |
| download | pacman-355930654693b416725e170ad0cb14d0251626e4.tar.gz pacman-355930654693b416725e170ad0cb14d0251626e4.tar.xz | |
scripts: allow usage when gettext is not installed
Address the issue of our scripts not working so great when gettext is not
available. This has come up in multiple bug reports, and is relatively easy
to address by adding a simple check and a stub function if gettext was not
found that simply echos the original message.
Addresses concerns from FS#9214 and FS#9607.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/gensync.sh.in | 7 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 9 | ||||
| -rw-r--r-- | scripts/pacman-optimize.sh.in | 9 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 7 | ||||
| -rw-r--r-- | scripts/repo-remove.sh.in | 7 | ||||
| -rw-r--r-- | scripts/updatesync.sh.in | 7 |
6 files changed, 46 insertions, 0 deletions
diff --git a/scripts/gensync.sh.in b/scripts/gensync.sh.in index eb1ef3a6..d5dec275 100644 --- a/scripts/gensync.sh.in +++ b/scripts/gensync.sh.in @@ -80,6 +80,13 @@ check_force () { # PROGRAM START +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + if [ "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 090ba5df..ed4794f0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1107,6 +1107,15 @@ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } +# PROGRAM START + +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + ARGLIST=$@ #preserve environment variables diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 21afd276..0cd108b7 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -70,6 +70,15 @@ die_r() { die "$@" } +# PROGRAM START + +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + if [ "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index efd3bc03..63d94d37 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -252,6 +252,13 @@ db_write_entry() # PROGRAM START +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + # check for help flags if [ "$1" = "-h" -o "$1" = "--help" ]; then usage diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in index fe230b02..47a0d5ae 100644 --- a/scripts/repo-remove.sh.in +++ b/scripts/repo-remove.sh.in @@ -95,6 +95,13 @@ db_remove_entry() { # PROGRAM START +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + # check for help flags if [ "$1" = "-h" -o "$1" = "--help" ]; then usage diff --git a/scripts/updatesync.sh.in b/scripts/updatesync.sh.in index 58ae0d56..5f5cc6c9 100644 --- a/scripts/updatesync.sh.in +++ b/scripts/updatesync.sh.in @@ -79,6 +79,13 @@ check_force () { # PROGRAM START +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + if [ "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 |