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>
This commit is contained in:
Dan McGee 2008-02-02 14:09:22 -06:00
parent c492ca840c
commit 4fad7855fa
8 changed files with 16 additions and 30 deletions

0
contrib/.gitignore vendored
View File

View File

@ -1,9 +1,11 @@
EXTRA_DIST = \
PKGBUILD.vim \
bash_completion \
gensync \
pacdiff \
pacsearch \
re-pacman \
updatesync \
vimproject \
wget-xdelta.sh \
zsh_completion \

View File

@ -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.

13
scripts/gensync.sh.in → contrib/gensync Normal file → Executable file
View File

@ -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

13
scripts/updatesync.sh.in → contrib/updatesync Normal file → Executable file
View File

@ -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

View File

@ -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

2
scripts/.gitignore vendored
View File

@ -1,7 +1,5 @@
gensync
makepkg
pacman-optimize
rankmirrors
repo-add
repo-remove
updatesync

View File

@ -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: