apply common coding style
This commit is contained in:
parent
7a8130fec8
commit
362a99b995
7
archco
7
archco
|
@ -1,10 +1,13 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ "$1" = "" ]; then
|
||||
echo "Usage: archco <package name> [<package name>]"
|
||||
if [ "$1" = '' ]; then
|
||||
echo 'Usage: archco <package name> [<package name>]'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for i in "$@"; do
|
||||
svn co svn+ssh://gerolde.archlinux.org/srv/svn-packages/$i
|
||||
done
|
||||
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
19
archrelease
19
archrelease
|
@ -1,23 +1,23 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ "$1" = "" ]; then
|
||||
echo "Usage: archrelease <repo>"
|
||||
if [ "$1" = '' ]; then
|
||||
echo 'Usage: archrelease <repo>'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f PKGBUILD ]; then
|
||||
echo "archrelease: PKGBUILD not found"
|
||||
echo 'archrelease: PKGBUILD not found'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$(basename $(readlink -f .))" != "trunk" ]; then
|
||||
echo "archrelease: Not in a package trunk dir"
|
||||
if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
|
||||
echo 'archrelease: Not in a package trunk dir'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$(svn diff)" != "" ]; then
|
||||
echo "archrelease: You have not committed your changes yet!"
|
||||
echo " Please run 'upgpkg' or 'svn commit' first"
|
||||
if [ "$(svn diff)" != '' ]; then
|
||||
echo 'archrelease: You have not committed your changes yet!'
|
||||
echo ' Please run "svn commit" first'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -31,3 +31,6 @@ svn copy -q -r HEAD trunk repos/$1
|
|||
svn commit -q -m "archrelease: copy trunk to $1"
|
||||
popd >/dev/null
|
||||
echo 'done'
|
||||
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
7
archrm
7
archrm
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ "$1" = "" ]; then
|
||||
echo "Usage: archrm <path to checkout>"
|
||||
if [ "$1" = '' ]; then
|
||||
echo 'Usage: archrm <path to checkout>'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -11,3 +11,6 @@ fi
|
|||
#popd
|
||||
|
||||
rm -rf $1
|
||||
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
19
checkpkg
19
checkpkg
|
@ -1,10 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Source makepkg.conf; fail if it is not found
|
||||
if [ -r "/etc/makepkg.conf" ]; then
|
||||
source "/etc/makepkg.conf"
|
||||
if [ -r '/etc/makepkg.conf' ]; then
|
||||
source '/etc/makepkg.conf'
|
||||
else
|
||||
echo "/etc/makepkg.conf not found!"
|
||||
echo '/etc/makepkg.conf not found!'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -18,13 +18,13 @@ strip_url() {
|
|||
}
|
||||
|
||||
if [ ! -f PKGBUILD ]; then
|
||||
echo "This must be run in the directory of a built package."
|
||||
echo 'This must be run in the directory of a built package.'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
source PKGBUILD
|
||||
if [ "$arch" == "any" ]; then
|
||||
CARCH="any"
|
||||
. PKGBUILD
|
||||
if [ "$arch" == 'any' ]; then
|
||||
CARCH='any'
|
||||
fi
|
||||
|
||||
for _pkgname in ${pkgname[@]}; do
|
||||
|
@ -61,7 +61,7 @@ for _pkgname in ${pkgname[@]}; do
|
|||
fi
|
||||
|
||||
if [ ! -f $oldpkg ]; then
|
||||
if echo $pkgurl | grep "^file:///" > /dev/null 2>&1; then
|
||||
if echo $pkgurl | grep '^file:///' > /dev/null 2>&1; then
|
||||
cp `echo $pkgurl | sed 's#^file://##'` .
|
||||
elif [ -f $PKGDEST/$oldpkg ]; then
|
||||
cp $PKGDEST/$oldpkg .
|
||||
|
@ -91,4 +91,5 @@ for _pkgname in ${pkgname[@]}; do
|
|||
fi
|
||||
done
|
||||
|
||||
# vim:ft=sh:ts=4:sw=4:et:
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
49
commitpkg
49
commitpkg
|
@ -1,49 +1,49 @@
|
|||
#!/bin/bash
|
||||
|
||||
abort() {
|
||||
echo ${1:-"Cancelled"}
|
||||
echo ${1:-'Cancelled'}
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
# Source makepkg.conf; fail if it is not found
|
||||
if [ -r "/etc/makepkg.conf" ]; then
|
||||
source "/etc/makepkg.conf"
|
||||
if [ -r '/etc/makepkg.conf' ]; then
|
||||
source '/etc/makepkg.conf'
|
||||
else
|
||||
abort "/etc/makepkg.conf not found!"
|
||||
abort '/etc/makepkg.conf not found!'
|
||||
fi
|
||||
|
||||
# Source user-specific makepkg.conf overrides
|
||||
if [ -r ~/.makepkg.conf ]; then
|
||||
source ~/.makepkg.conf
|
||||
. ~/.makepkg.conf
|
||||
fi
|
||||
|
||||
cmd=$(basename "$0")
|
||||
|
||||
if [ ! -f PKGBUILD ]; then
|
||||
abort "No PKGBUILD file"
|
||||
abort 'No PKGBUILD file'
|
||||
fi
|
||||
|
||||
source PKGBUILD
|
||||
. PKGBUILD
|
||||
pkgbase=${pkgbase:-$pkgname}
|
||||
|
||||
# set up repo-specific opts depending on how we were called
|
||||
server="gerolde.archlinux.org"
|
||||
if [ "$cmd" == "extrapkg" ]; then
|
||||
repo="extra"
|
||||
elif [ "$cmd" == "corepkg" ]; then
|
||||
repo="core"
|
||||
elif [ "$cmd" == "testingpkg" ]; then
|
||||
repo="testing"
|
||||
elif [ "$cmd" == "communitypkg" ]; then
|
||||
repo="community"
|
||||
server="aur.archlinux.org"
|
||||
elif [ "$cmd" == "community-testingpkg" ]; then
|
||||
repo="community-testing"
|
||||
server="aur.archlinux.org"
|
||||
server='gerolde.archlinux.org'
|
||||
if [ "$cmd" == 'extrapkg' ]; then
|
||||
repo='extra'
|
||||
elif [ "$cmd" == 'corepkg' ]; then
|
||||
repo='core'
|
||||
elif [ "$cmd" == 'testingpkg' ]; then
|
||||
repo='testing'
|
||||
elif [ "$cmd" == 'communitypkg' ]; then
|
||||
repo='community'
|
||||
server='aur.archlinux.org'
|
||||
elif [ "$cmd" == 'community-testingpkg' ]; then
|
||||
repo='community-testing'
|
||||
server='aur.archlinux.org'
|
||||
else
|
||||
if [ $# -eq 0 ]; then
|
||||
abort "usage: commitpkg <reponame> [-l limit] [commit message]"
|
||||
abort 'usage: commitpkg <reponame> [-l limit] [commit message]'
|
||||
fi
|
||||
repo="$1"
|
||||
shift
|
||||
|
@ -58,7 +58,7 @@ done) || true
|
|||
|
||||
# see if any limit options were passed, we'll send them to rsync
|
||||
unset rsyncopts
|
||||
if [ "$1" = "-l" ]; then
|
||||
if [ "$1" = '-l' ]; then
|
||||
rsyncopts="--bwlimit=$2"
|
||||
shift 2
|
||||
fi
|
||||
|
@ -89,7 +89,7 @@ for _arch in ${arch[@]}; do
|
|||
archrelease $repo-${_arch} || abort
|
||||
done
|
||||
|
||||
if [ "${arch[*]}" == "any" ]; then
|
||||
if [ "${arch[*]}" == 'any' ]; then
|
||||
if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
|
||||
pushd ../repos/ >/dev/null
|
||||
echo -n "removing $repo-i686 and $repo-x86_64..."
|
||||
|
@ -101,4 +101,5 @@ if [ "${arch[*]}" == "any" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# vim:ft=sh:ts=4:sw=4:et:
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [ "$1" = "" ]; then
|
||||
echo "Usage: communityco <package name> [<package name>]"
|
||||
if [ "$1" = '' ]; then
|
||||
echo 'Usage: communityco <package name> [<package name>]'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for i in "$@"; do
|
||||
svn co svn+ssh://aur.archlinux.org/srv/svn-packages/$i
|
||||
done
|
||||
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
15
finddeps
15
finddeps
|
@ -3,12 +3,12 @@
|
|||
# finddeps - find packages that depend on a given depname
|
||||
#
|
||||
|
||||
if [ "$1" = "" ]; then
|
||||
echo "usage: finddeps <depname>"
|
||||
echo ""
|
||||
echo "Find packages that depend on a given depname."
|
||||
echo "Run this script from the top-level directory of your ABS tree."
|
||||
echo ""
|
||||
if [ "$1" = '' ]; then
|
||||
echo 'usage: finddeps <depname>'
|
||||
echo ''
|
||||
echo 'Find packages that depend on a given depname.'
|
||||
echo 'Run this script from the top-level directory of your ABS tree.'
|
||||
echo ''
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
@ -38,4 +38,5 @@ for d in $(find . -type d); do
|
|||
cd $tld
|
||||
done
|
||||
|
||||
# vim:ft=sh:ts=4:sw=4:et:
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
20
lddd
20
lddd
|
@ -6,24 +6,27 @@
|
|||
ifs=$IFS
|
||||
IFS=':'
|
||||
|
||||
libdirs="/lib:/usr/lib:/opt/qt/lib:/opt/kde/lib:/usr/lib/libfakeroot:/opt/NX/lib"
|
||||
libdirs='/lib:/usr/lib:/opt/qt/lib:/opt/kde/lib:/usr/lib/libfakeroot:/opt/NX/lib'
|
||||
extras=
|
||||
|
||||
TEMPDIR=$(mktemp /tmp/lddd-script.XXXX)
|
||||
rm $TEMPDIR
|
||||
mkdir -p $TEMPDIR
|
||||
|
||||
echo " Go out and drink some tea, this will take a while :) ..."
|
||||
echo 'Go out and drink some tea, this will take a while :) ...'
|
||||
# Check ELF binaries in the PATH and specified dir trees.
|
||||
for tree in $PATH $libdirs $extras
|
||||
do
|
||||
for tree in $PATH $libdirs $extras; do
|
||||
echo DIR $tree
|
||||
|
||||
# Get list of files in tree.
|
||||
files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! -name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name '*.cmi' ! -name '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' ! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' ! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name '*.msg' ! -name '*.mcopclass' ! -name '*.mcoptype')
|
||||
files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' !
|
||||
-name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name
|
||||
'*.cmi' ! -name '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm'
|
||||
! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo'
|
||||
! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name
|
||||
'*.msg' ! -name '*.mcopclass' ! -name '*.mcoptype')
|
||||
IFS=$ifs
|
||||
for i in $files
|
||||
do
|
||||
for i in $files; do
|
||||
if [ `file $i | grep -c 'ELF'` -ne 0 ]; then
|
||||
# Is an ELF binary.
|
||||
if [ `ldd $i 2>/dev/null | grep -c 'not found'` -ne 0 ]; then
|
||||
|
@ -44,4 +47,5 @@ sort -u $TEMPDIR/pacman.txt >> $TEMPDIR/possible-rebuilds.txt
|
|||
|
||||
echo "Files saved to $TEMPDIR"
|
||||
|
||||
# vim:ft=sh:ts=4:sw=4:et:
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
|
@ -8,50 +8,49 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
FORCE="n"
|
||||
RUN=""
|
||||
MAKEPKG_ARGS="-sr"
|
||||
REPACK=""
|
||||
COPY="copy"
|
||||
FORCE='n'
|
||||
RUN=''
|
||||
MAKEPKG_ARGS='-sr'
|
||||
REPACK=''
|
||||
COPY='copy'
|
||||
WORKDIR=$PWD
|
||||
|
||||
update_first="0"
|
||||
clean_first="0"
|
||||
install_pkg=""
|
||||
update_first='0'
|
||||
clean_first='0'
|
||||
install_pkg=''
|
||||
add_to_db=0
|
||||
|
||||
chrootdir=""
|
||||
chrootdir=''
|
||||
|
||||
APPNAME=$(basename "${0}")
|
||||
|
||||
usage ()
|
||||
{
|
||||
usage() {
|
||||
echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
|
||||
echo " Run this script in a PKGBUILD dir to build a package inside a"
|
||||
echo " clean chroot. All unrecognized arguments passed to this script"
|
||||
echo " will be passed to makepkg."
|
||||
echo ""
|
||||
echo " The chroot dir consists of the following directories:"
|
||||
echo " <chrootdir>/{root, copy} but only 'root' is required"
|
||||
echo " by default. The working copy will be created as needed"
|
||||
echo ""
|
||||
echo "The chroot 'root' directory must be created via the following"
|
||||
echo "command:"
|
||||
echo " mkarchroot <chrootdir>/root base base-devel sudo"
|
||||
echo ""
|
||||
echo ' Run this script in a PKGBUILD dir to build a package inside a'
|
||||
echo ' clean chroot. All unrecognized arguments passed to this script'
|
||||
echo ' will be passed to makepkg.'
|
||||
echo ''
|
||||
echo ' The chroot dir consists of the following directories:'
|
||||
echo ' <chrootdir>/{root, copy} but only "root" is required'
|
||||
echo ' by default. The working copy will be created as needed'
|
||||
echo ''
|
||||
echo 'The chroot "root" directory must be created via the following'
|
||||
echo 'command:'
|
||||
echo ' mkarchroot <chrootdir>/root base base-devel sudo'
|
||||
echo ''
|
||||
echo "Default makepkg args: $MAKEPKG_ARGS"
|
||||
echo ""
|
||||
echo "Flags:"
|
||||
echo "-h This help"
|
||||
echo "-c Clean the chroot before building"
|
||||
echo "-u Update the working copy of the chroot before building"
|
||||
echo " This is useful for rebuilds without dirtying the pristine"
|
||||
echo " chroot"
|
||||
echo "-d Add the package to a local db at /repo after building"
|
||||
echo "-r <dir> The chroot dir to use"
|
||||
echo "-I <pkg> Install a package into the working copy of the chroot"
|
||||
echo "-l <copy> The directory to use as the working copy of the chroot"
|
||||
echo " Useful for maintain multiple copies Default: copy"
|
||||
echo ''
|
||||
echo 'Flags:'
|
||||
echo '-h This help'
|
||||
echo '-c Clean the chroot before building'
|
||||
echo '-u Update the working copy of the chroot before building'
|
||||
echo ' This is useful for rebuilds without dirtying the pristine'
|
||||
echo ' chroot'
|
||||
echo '-d Add the package to a local db at /repo after building'
|
||||
echo '-r <dir> The chroot dir to use'
|
||||
echo '-I <pkg> Install a package into the working copy of the chroot'
|
||||
echo '-l <copy> The directory to use as the working copy of the chroot'
|
||||
echo ' Useful for maintain multiple copies Default: copy'
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
@ -77,19 +76,19 @@ MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
|
|||
|
||||
# See if -R was passed to makepkg
|
||||
for arg in ${*:$OPTIND}; do
|
||||
if [ "$arg" = "-R" ]; then
|
||||
if [ "$arg" = '-R' ]; then
|
||||
REPACK=1
|
||||
break;
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$EUID" != "0" ]; then
|
||||
echo "This script must be run as root."
|
||||
if [ "$EUID" != '0' ]; then
|
||||
echo 'This script must be run as root.'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -f PKGBUILD ]; then
|
||||
echo "This must be run in a directory containing a PKGBUILD."
|
||||
echo 'This must be run in a directory containing a PKGBUILD.'
|
||||
exit 1
|
||||
fi
|
||||
source PKGBUILD
|
||||
|
@ -100,7 +99,7 @@ if [ ! -d "$chrootdir" ]; then
|
|||
fi
|
||||
|
||||
if [ ! -d "$chrootdir/root" ]; then
|
||||
echo "Missing chroot dir root directory."
|
||||
echo 'Missing chroot dir root directory.'
|
||||
echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
|
||||
usage
|
||||
fi
|
||||
|
@ -124,7 +123,7 @@ if [ -n "$install_pkg" ]; then
|
|||
fi
|
||||
|
||||
if [ $update_first -eq 1 ]; then
|
||||
mkarchroot -r "pacman -Syu --noconfirm" "$copydir"
|
||||
mkarchroot -r 'pacman -Syu --noconfirm' "$copydir"
|
||||
fi
|
||||
|
||||
[ -d "$copydir/build" ] || mkdir "$copydir/build"
|
||||
|
@ -139,13 +138,13 @@ SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
|
|||
PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
|
||||
|
||||
[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"
|
||||
if ! grep "PKGDEST=/pkgdest" "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
|
||||
echo "PKGDEST=/pkgdest" >> "$copydir/etc/makepkg.conf"
|
||||
if ! grep 'PKGDEST=/pkgdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
|
||||
echo 'PKGDEST=/pkgdest' >> "$copydir/etc/makepkg.conf"
|
||||
fi
|
||||
|
||||
[ -d "$copydir/srcdest" ] || mkdir "$copydir/srcdest"
|
||||
if ! grep "SRCDEST=/srcdest" "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
|
||||
echo "SRCDEST=/srcdest" >> "$copydir/etc/makepkg.conf"
|
||||
if ! grep 'SRCDEST=/srcdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
|
||||
echo 'SRCDEST=/srcdest' >> "$copydir/etc/makepkg.conf"
|
||||
fi
|
||||
|
||||
# Copy PKGBUILD and sources
|
||||
|
@ -160,7 +159,7 @@ for f in ${source[@]}; do
|
|||
fi
|
||||
done
|
||||
|
||||
install_files=$(grep "install=" PKGBUILD)
|
||||
install_files=$(grep 'install=' PKGBUILD)
|
||||
for pkg in ${pkgname[@]}; do
|
||||
install_files+=' '
|
||||
install_files+=$(echo $install_files |sed "s/\$pkgname/$pkg/"|sed "s/\${pkgname}/$pkg/")
|
||||
|
@ -174,7 +173,7 @@ for f in $install_files;do
|
|||
fi
|
||||
done
|
||||
|
||||
if [ -f "ChangeLog" ]; then
|
||||
if [ -f 'ChangeLog' ]; then
|
||||
cp ChangeLog "$copydir/build/"
|
||||
fi
|
||||
|
||||
|
@ -184,7 +183,7 @@ chown -R nobody "$copydir/pkgdest"
|
|||
|
||||
if ! grep "^nobody" "$copydir/etc/sudoers" >/dev/null 2>&1; then
|
||||
touch "$copydir/etc/sudoers"
|
||||
echo "nobody ALL=(ALL) NOPASSWD: ALL" >> "$copydir/etc/sudoers"
|
||||
echo 'nobody ALL=(ALL) NOPASSWD: ALL' >> "$copydir/etc/sudoers"
|
||||
chmod 440 "$copydir/etc/sudoers"
|
||||
fi
|
||||
|
||||
|
@ -246,5 +245,5 @@ else
|
|||
rm -rf "${copydir}"/build/*
|
||||
fi
|
||||
|
||||
|
||||
# vim:ft=sh:ts=4:sw=4:et:
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
66
mkarchroot
66
mkarchroot
|
@ -8,63 +8,62 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
FORCE="n"
|
||||
RUN=""
|
||||
NOCOPY="n"
|
||||
FORCE='n'
|
||||
RUN=''
|
||||
NOCOPY='n'
|
||||
|
||||
working_dir=""
|
||||
working_dir=''
|
||||
|
||||
APPNAME=$(basename "${0}")
|
||||
|
||||
# usage: usage <exitvalue>
|
||||
usage ()
|
||||
{
|
||||
usage() {
|
||||
echo "usage ${APPNAME} [options] working-dir [package-list | app]"
|
||||
echo " options:"
|
||||
echo " -r <app> Run 'app' within the context of the chroot"
|
||||
echo " -u Update the chroot via pacman"
|
||||
echo " -f Force overwrite of files in the working-dir"
|
||||
echo " -C <file> Location of a pacman config file"
|
||||
echo " -M <file> Location of a makepkg config file"
|
||||
echo " -n Do not copy config files into the chroot"
|
||||
echo ' options:'
|
||||
echo ' -r <app> Run "app" within the context of the chroot'
|
||||
echo ' -u Update the chroot via pacman'
|
||||
echo ' -f Force overwrite of files in the working-dir'
|
||||
echo ' -C <file> Location of a pacman config file'
|
||||
echo ' -M <file> Location of a makepkg config file'
|
||||
echo ' -n Do not copy config files into the chroot'
|
||||
echo " -c <dir> Set pacman cache. Default: ${cache_dir}"
|
||||
echo " -h This message"
|
||||
echo ' -h This message'
|
||||
exit $1
|
||||
}
|
||||
|
||||
while getopts 'r:ufnhC:M:c:' arg; do
|
||||
case "${arg}" in
|
||||
r) RUN="$OPTARG" ;;
|
||||
u) RUN="pacman -Syu" ;;
|
||||
f) FORCE="y" ;;
|
||||
u) RUN='pacman -Syu' ;;
|
||||
f) FORCE='y' ;;
|
||||
C) pac_conf="$OPTARG" ;;
|
||||
M) makepkg_conf="$OPTARG" ;;
|
||||
n) NOCOPY="y" ;;
|
||||
n) NOCOPY='y' ;;
|
||||
c) cache_dir="$OPTARG" ;;
|
||||
h|?) usage 0 ;;
|
||||
*) echo "invalid argument '${arg}'"; usage 1 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ "$EUID" != "0" ]; then
|
||||
echo "error: this script must be run as root."
|
||||
if [ "$EUID" != '0' ]; then
|
||||
echo 'error: this script must be run as root.'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
shift $(($OPTIND - 1))
|
||||
|
||||
if [ "$RUN" = "" -a $# -lt 2 ]; then
|
||||
echo "you must specify a directory and one or more packages"
|
||||
if [ "$RUN" = '' -a $# -lt 2 ]; then
|
||||
echo 'you must specify a directory and one or more packages'
|
||||
usage 1
|
||||
elif [ $# -lt 1 ]; then
|
||||
echo "you must specify a directory"
|
||||
echo 'you must specify a directory'
|
||||
usage 1
|
||||
fi
|
||||
|
||||
working_dir="$(readlink -f ${1})"
|
||||
shift 1
|
||||
|
||||
[ "${working_dir}" = "" ] && echo "error: please specify a working directory" && usage 1
|
||||
[ "${working_dir}" = '' ] && echo 'error: please specify a working directory' && usage 1
|
||||
|
||||
if [ -z "$cache_dir" ]; then
|
||||
cache_conf=${working_dir}/etc/pacman.conf
|
||||
|
@ -75,8 +74,7 @@ fi
|
|||
|
||||
# {{{ functions
|
||||
|
||||
chroot_mount ()
|
||||
{
|
||||
chroot_mount() {
|
||||
[ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
|
||||
mount -t sysfs sysfs "${working_dir}/sys"
|
||||
|
||||
|
@ -93,15 +91,12 @@ chroot_mount ()
|
|||
trap 'chroot_umount' 0 1 2 15
|
||||
}
|
||||
|
||||
copy_hostconf ()
|
||||
{
|
||||
copy_hostconf () {
|
||||
cp /etc/mtab "${working_dir}/etc/mtab"
|
||||
cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
|
||||
|
||||
}
|
||||
|
||||
chroot_umount ()
|
||||
{
|
||||
chroot_umount () {
|
||||
umount "${working_dir}/proc"
|
||||
umount "${working_dir}/sys"
|
||||
umount "${working_dir}/dev"
|
||||
|
@ -115,7 +110,7 @@ if [ "$RUN" != "" ]; then
|
|||
#Sanity check
|
||||
if [ ! -f "${working_dir}/.arch-chroot" ]; then
|
||||
echo "error: '${working_dir}' does not appear to be a Arch chroot"
|
||||
echo " please build the image using mkarchroot"
|
||||
echo ' please build the image using mkarchroot'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -137,7 +132,7 @@ else
|
|||
|
||||
chroot_mount
|
||||
|
||||
pacargs="--noconfirm -v " #--noprogressbar -v
|
||||
pacargs='--noconfirm -v ' #--noprogressbar -v
|
||||
pacargs="$pacargs --root=${working_dir}"
|
||||
# pacman takes these as relative to the given root
|
||||
pacargs="$pacargs --cachedir=${cache_dir}"
|
||||
|
@ -146,12 +141,12 @@ else
|
|||
fi
|
||||
|
||||
if [ $# -ne 0 ]; then
|
||||
op="-Sy"
|
||||
op='-Sy'
|
||||
if [ "$FORCE" = "y" ]; then
|
||||
op="${op}f"
|
||||
fi
|
||||
if ! pacman ${op} ${pacargs} $@; then
|
||||
echo "error: failed to install all packages"
|
||||
echo 'error: failed to install all packages'
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
@ -179,4 +174,5 @@ else
|
|||
# }}}
|
||||
fi
|
||||
|
||||
# vim:ft=sh:ts=4:sw=4:et:
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
21
rebuildpkgs
21
rebuildpkgs
|
@ -16,10 +16,10 @@ if [ $# -le 1 ]; then
|
|||
fi
|
||||
|
||||
# Source makepkg.conf; fail if it is not found
|
||||
if [ -r "/etc/makepkg.conf" ]; then
|
||||
source "/etc/makepkg.conf"
|
||||
if [ -r '/etc/makepkg.conf' ]; then
|
||||
source '/etc/makepkg.conf'
|
||||
else
|
||||
echo "/etc/makepkg.conf not found!"
|
||||
echo '/etc/makepkg.conf not found!'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -31,8 +31,8 @@ die () {
|
|||
bump_pkgrel() {
|
||||
# Get the current pkgrel from SVN and update the working copy with it
|
||||
# This prevents us from incrementing out of control :)
|
||||
pbuild=".svn/text-base/PKGBUILD.svn-base"
|
||||
oldrel=$(grep "pkgrel=" $pbuild | cut -d= -f2)
|
||||
pbuild='.svn/text-base/PKGBUILD.svn-base'
|
||||
oldrel=$(grep 'pkgrel=' $pbuild | cut -d= -f2)
|
||||
|
||||
#remove decimals
|
||||
rel=$(echo $oldrel | cut -d. -f1)
|
||||
|
@ -45,13 +45,13 @@ bump_pkgrel () {
|
|||
pkg_from_pkgbuild() {
|
||||
# we want the sourcing to be done in a subshell so we don't pollute our current namespace
|
||||
export CARCH PKGEXT
|
||||
(. PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
|
||||
(source PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
|
||||
}
|
||||
|
||||
chrootdir="$1"; shift
|
||||
pkgs="$@"
|
||||
|
||||
SVNPATH="svn+ssh://gerolde.archlinux.org/srv/svn-packages"
|
||||
SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
|
||||
|
||||
echo ":: Work will be done in $(pwd)/rebuilds"
|
||||
|
||||
|
@ -92,10 +92,13 @@ done
|
|||
|
||||
cd "$REBUILD_ROOT"
|
||||
if [ "$FAILED" != "" ]; then
|
||||
echo "Packages failed:"
|
||||
echo 'Packages failed:'
|
||||
for pkg in $FAILED; do
|
||||
echo -e "\t$pkg"
|
||||
done
|
||||
fi
|
||||
|
||||
echo "SVN pkgbumps in svn-packages/ - commit when ready"
|
||||
echo 'SVN pkgbumps in svn-packages/ - commit when ready'
|
||||
|
||||
# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
|
||||
# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132
|
||||
|
|
Loading…
Reference in New Issue