Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-02 14:09:22 -0600
committerDan McGee <dan@archlinux.org>2008-02-02 14:12:34 -0600
commit4fad7855fae4a01b265c7d28c12b995a19ebc72d (patch)
treecf4802d0d1bfa36f05d0506a001017e004505585
parentc492ca840c54d8d45d5916a280f2119c363e0aba (diff)
Remove gensync and updatesync from normal distribution
Move these two scripts into contrib/, and start the process of de-automaking them by removing the @sysconfdir@ references and the gettext initialization. The removal of all gettext will soon follow. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--contrib/.gitignore0
-rw-r--r--contrib/Makefile.am2
-rw-r--r--contrib/README4
-rwxr-xr-x[-rw-r--r--]contrib/gensync (renamed from scripts/gensync.sh.in)13
-rwxr-xr-x[-rw-r--r--]contrib/updatesync (renamed from scripts/updatesync.sh.in)13
-rw-r--r--po/POTFILES.in2
-rw-r--r--scripts/.gitignore2
-rw-r--r--scripts/Makefile.am10
8 files changed, 16 insertions, 30 deletions
diff --git a/contrib/.gitignore b/contrib/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/contrib/.gitignore
+++ /dev/null
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 9f01e187..7654848f 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,9 +1,11 @@
EXTRA_DIST = \
PKGBUILD.vim \
bash_completion \
+ gensync \
pacdiff \
pacsearch \
re-pacman \
+ updatesync \
vimproject \
wget-xdelta.sh \
zsh_completion \
diff --git a/contrib/README b/contrib/README
index c9ff86f4..0edeaf7d 100644
--- a/contrib/README
+++ b/contrib/README
@@ -25,3 +25,7 @@ may need to be updated).
wget-xdelta.sh - A download script for pacman which allows binary deltas
generated with makepkg to be used instead of downloading full binary packages.
This should cut download sizes for some package upgrades significantly.
+
+gensync, updatesync - The former repository management scripts that have since
+been superseded by repo-add and repo-remove. They are here for posterity's
+sake, and to show how repo-add and repo-remove can be wrapped in other scripts.
diff --git a/scripts/gensync.sh.in b/contrib/gensync
index 04f80022..829ae3c2 100644..100755
--- a/scripts/gensync.sh.in
+++ b/contrib/gensync
@@ -1,7 +1,6 @@
#!/bin/bash
#
# gensync
-# @configure_input@
#
# Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
#
@@ -19,11 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-# gettext initialization
-export TEXTDOMAIN='pacman'
-export TEXTDOMAINDIR='@localedir@'
-
-myver='@PACKAGE_VERSION@'
+myver='3.1.1'
# functions
@@ -93,10 +88,10 @@ if [ $# -lt 2 ]; then
fi
# source system and user makepkg.conf
-if [ -r @sysconfdir@/makepkg.conf ]; then
- source @sysconfdir@/makepkg.conf
+if [ -r /etc/makepkg.conf ]; then
+ source /etc/makepkg.conf
else
- die "$(gettext "%s not found. Can not continue.")" "@sysconfdir@/makepkg.conf"
+ die "/etc/makepkg.conf not found. Cannot continue."
fi
if [ -r ~/.makepkg.conf ]; then
diff --git a/scripts/updatesync.sh.in b/contrib/updatesync
index c777d1f1..4df02ef9 100644..100755
--- a/scripts/updatesync.sh.in
+++ b/contrib/updatesync
@@ -1,7 +1,6 @@
#!/bin/bash
#
# updatesync
-# @configure_input@
#
# Copyright (c) 2004 by Jason Chu <jason@archlinux.org>
# Derived from gensync (c) 2002-2006 Judd Vinet <jvinet@zeroflux.org>
@@ -20,11 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-# gettext initialization
-export TEXTDOMAIN='pacman'
-export TEXTDOMAINDIR='@localedir@'
-
-myver='@PACKAGE_VERSION@'
+myver='3.1.1'
# functions
@@ -92,10 +87,10 @@ if [ $# -lt 3 ]; then
fi
# source system and user makepkg.conf
-if [ -r @sysconfdir@/makepkg.conf ]; then
- source @sysconfdir@/makepkg.conf
+if [ -r /etc/makepkg.conf ]; then
+ source /etc/makepkg.conf
else
- die "$(gettext "%s not found. Can not continue.")" "@sysconfdir@/makepkg.conf"
+ die "/etc/makepkg.conf not found. Cannot continue."
fi
if [ -r ~/.makepkg.conf ]; then
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 359a8041..4d4227d1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,9 +13,7 @@ src/pacman/sync.c
src/pacman/util.c
# scripts with gettext translations
-scripts/gensync.sh.in
scripts/makepkg.sh.in
scripts/pacman-optimize.sh.in
scripts/repo-add.sh.in
scripts/repo-remove.sh.in
-scripts/updatesync.sh.in
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 53164a41..f2f19fd8 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,7 +1,5 @@
-gensync
makepkg
pacman-optimize
rankmirrors
repo-add
repo-remove
-updatesync
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 24b9c12d..3185a476 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,22 +2,18 @@
AUTOMAKE_OPTIONS = std-options
bin_SCRIPTS = \
- gensync \
makepkg \
pacman-optimize \
rankmirrors \
repo-add \
- repo-remove \
- updatesync
+ repo-remove
EXTRA_DIST = \
- gensync.sh.in \
makepkg.sh.in \
pacman-optimize.sh.in \
rankmirrors.py.in \
repo-add.sh.in \
- repo-remove.sh.in \
- updatesync.sh.in
+ repo-remove.sh.in
# Files that should be removed, but which Automake does not know.
MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp
@@ -48,13 +44,11 @@ $(bin_SCRIPTS): Makefile
chmod a-w $@.tmp
mv $@.tmp $@
-gensync: $(srcdir)/gensync.sh.in
makepkg: $(srcdir)/makepkg.sh.in
pacman-optimize: $(srcdir)/pacman-optimize.sh.in
rankmirrors: $(srcdir)/rankmirrors.py.in
repo-add: $(srcdir)/repo-add.sh.in
repo-remove: $(srcdir)/repo-remove.sh.in
re-pacman: $(srcdir)/re-pacman.sh.in
-updatesync: $(srcdir)/updatesync.sh.in
# vim:set ts=2 sw=2 noet: