Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-20 18:57:46 -0600
committerDan McGee <dan@archlinux.org>2008-02-20 18:58:04 -0600
commit4bd52f3fe4d21fc4d54aba7b7c5d3134d69f9341 (patch)
tree0174e2bcf440f66cc94d75c4840bac3862bdb926 /scripts
parent92ab7c33fb4d72eba070636f620f595dc4650ee9 (diff)
parent420c8846b984b5ca8ddd27ff7b799ec77fbbc2a4 (diff)
Merge branch 'maint'
Remove gettext() function addition from gensync and updatesync in master as gettext is no longer used in them anyway.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in13
-rw-r--r--scripts/pacman-optimize.sh.in9
-rw-r--r--scripts/repo-add.sh.in7
-rw-r--r--scripts/repo-remove.sh.in7
4 files changed, 34 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 090ba5df..598e6879 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -939,8 +939,8 @@ create_xdelta() {
create_srcpackage() {
cd "$startdir"
msg "$(gettext "Creating source package...")"
- local comp_files="PKGBUILD"
- msg2 "$(gettext "Adding %s...")" "PKGBUILD"
+ local comp_files="$BUILDSCRIPT"
+ msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT"
if [ "$install" != "" ]; then
if [ -f $install ]; then
@@ -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 00eec7ec..f837262d 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -247,6 +247,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