Make slightly more involved changes to make shellcheck happy.
- Use `read -r` instead of other forms of read or looping - Use arrays instead of strings with whitespaces. - In one instance, use ${var%%.*} instead of $(echo $var|cut -f. -d1)
This commit is contained in:
parent
78fabcfa06
commit
a396a69081
|
@ -38,7 +38,7 @@ trunk=${PWD##*/}
|
||||||
# Normally this should be trunk, but it may be something
|
# Normally this should be trunk, but it may be something
|
||||||
# such as 'gnome-unstable'
|
# such as 'gnome-unstable'
|
||||||
IFS='/' read -r -d '' -a parts <<< "$PWD"
|
IFS='/' read -r -d '' -a parts <<< "$PWD"
|
||||||
if [[ "${parts[@]:(-2):1}" == "repos" ]]; then
|
if [[ "${parts[*]:(-2):1}" == "repos" ]]; then
|
||||||
die 'archrelease: Should not be in repos dir (try from trunk/)'
|
die 'archrelease: Should not be in repos dir (try from trunk/)'
|
||||||
fi
|
fi
|
||||||
unset parts
|
unset parts
|
||||||
|
@ -67,7 +67,7 @@ for tag in "$@"; do
|
||||||
while read -r file; do
|
while read -r file; do
|
||||||
trash+=("repos/$tag/$file")
|
trash+=("repos/$tag/$file")
|
||||||
done < <(svn ls "repos/$tag")
|
done < <(svn ls "repos/$tag")
|
||||||
[[ $trash ]] && svn rm -q "${trash[@]/%/@}"
|
[[ ${#trash[@]} == 0 ]] || svn rm -q "${trash[@]/%/@}"
|
||||||
else
|
else
|
||||||
mkdir -p "repos/$tag"
|
mkdir -p "repos/$tag"
|
||||||
svn add --parents -q "repos/$tag"
|
svn add --parents -q "repos/$tag"
|
||||||
|
|
|
@ -148,9 +148,9 @@ for _arch in "${arch[@]}"; do
|
||||||
if [[ ! -f $sigfile ]]; then
|
if [[ ! -f $sigfile ]]; then
|
||||||
msg "Signing package %s..." "${pkgfile}"
|
msg "Signing package %s..." "${pkgfile}"
|
||||||
if [[ -n $GPGKEY ]]; then
|
if [[ -n $GPGKEY ]]; then
|
||||||
SIGNWITHKEY="-u ${GPGKEY}"
|
SIGNWITHKEY=(-u "${GPGKEY}")
|
||||||
fi
|
fi
|
||||||
gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "${pkgfile}" || die
|
gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "${pkgfile}" || die
|
||||||
fi
|
fi
|
||||||
if ! gpg --verify "$sigfile" >/dev/null 2>&1; then
|
if ! gpg --verify "$sigfile" >/dev/null 2>&1; then
|
||||||
die "Signature %s.sig is incorrect!" "$pkgfile"
|
die "Signature %s.sig is incorrect!" "$pkgfile"
|
||||||
|
|
|
@ -60,7 +60,7 @@ case $script_mode in
|
||||||
provides) find_args=(-name '*.so*');;
|
provides) find_args=(-name '*.so*');;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
find . -type f "${find_args[@]}" | while read filename; do
|
find . -type f "${find_args[@]}" | while read -r filename; do
|
||||||
if [[ $script_mode = "provides" ]]; then
|
if [[ $script_mode = "provides" ]]; then
|
||||||
# ignore if we don't have a shared object
|
# ignore if we don't have a shared object
|
||||||
if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then
|
if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then
|
||||||
|
|
|
@ -17,7 +17,7 @@ if [[ -z $match ]]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find . -type d | while read d; do
|
find . -type d | while read -r d; do
|
||||||
if [[ -f "$d/PKGBUILD" ]]; then
|
if [[ -f "$d/PKGBUILD" ]]; then
|
||||||
pkgname=() depends=() makedepends=() optdepends=()
|
pkgname=() depends=() makedepends=() optdepends=()
|
||||||
. "$d/PKGBUILD"
|
. "$d/PKGBUILD"
|
||||||
|
|
4
lddd.in
4
lddd.in
|
@ -40,9 +40,9 @@ for tree in $PATH $libdirs $extras; do
|
||||||
done
|
done
|
||||||
grep '^/' "$TEMPDIR/raw.txt" | sed -e 's/://g' >> "$TEMPDIR/affected-files.txt"
|
grep '^/' "$TEMPDIR/raw.txt" | sed -e 's/://g' >> "$TEMPDIR/affected-files.txt"
|
||||||
# invoke pacman
|
# invoke pacman
|
||||||
for i in $(cat $TEMPDIR/affected-files.txt); do
|
while read -r i; do
|
||||||
pacman -Qo "$i" | awk '{print $4,$5}' >> "$TEMPDIR/pacman.txt"
|
pacman -Qo "$i" | awk '{print $4,$5}' >> "$TEMPDIR/pacman.txt"
|
||||||
done
|
done < "$TEMPDIR/affected-files.txt"
|
||||||
# clean list
|
# clean list
|
||||||
sort -u "$TEMPDIR/pacman.txt" >> "$TEMPDIR/possible-rebuilds.txt"
|
sort -u "$TEMPDIR/pacman.txt" >> "$TEMPDIR/possible-rebuilds.txt"
|
||||||
|
|
||||||
|
|
|
@ -123,24 +123,27 @@ in_array() {
|
||||||
##
|
##
|
||||||
get_full_version() {
|
get_full_version() {
|
||||||
# set defaults if they weren't specified in buildfile
|
# set defaults if they weren't specified in buildfile
|
||||||
pkgbase=${pkgbase:-${pkgname[0]}}
|
local pkgbase=${pkgbase:-${pkgname[0]}}
|
||||||
epoch=${epoch:-0}
|
local epoch=${epoch:-0}
|
||||||
|
local pkgver=${pkgver}
|
||||||
|
local pkgrel=${pkgrel}
|
||||||
if [[ -z $1 ]]; then
|
if [[ -z $1 ]]; then
|
||||||
if (( ! epoch )); then
|
if (( ! epoch )); then
|
||||||
echo $pkgver-$pkgrel
|
printf '%s\n' "$pkgver-$pkgrel"
|
||||||
else
|
else
|
||||||
echo $epoch:$pkgver-$pkgrel
|
printf '%s\n' "$epoch:$pkgver-$pkgrel"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
local pkgver_override='' pkgrel_override='' epoch_override=''
|
||||||
for i in pkgver pkgrel epoch; do
|
for i in pkgver pkgrel epoch; do
|
||||||
local indirect="${i}_override"
|
local indirect="${i}_override"
|
||||||
eval "$(declare -f "package_$1" | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")"
|
eval "$(declare -f "package_$1" | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")"
|
||||||
[[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
|
[[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
|
||||||
done
|
done
|
||||||
if (( ! epoch_override )); then
|
if (( ! epoch_override )); then
|
||||||
echo $pkgver_override-$pkgrel_override
|
printf '%s\n' "$pkgver_override-$pkgrel_override"
|
||||||
else
|
else
|
||||||
echo $epoch_override:$pkgver_override-$pkgrel_override
|
printf '%s\n' "$epoch_override:$pkgver_override-$pkgrel_override"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ bump_pkgrel() {
|
||||||
oldrel=$(grep 'pkgrel=' $pbuild | cut -d= -f2)
|
oldrel=$(grep 'pkgrel=' $pbuild | cut -d= -f2)
|
||||||
|
|
||||||
#remove decimals
|
#remove decimals
|
||||||
rel=$(echo $oldrel | cut -d. -f1)
|
rel=${oldrel%%.*}
|
||||||
|
|
||||||
newrel=$((rel + 1))
|
newrel=$((rel + 1))
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ pkg_from_pkgbuild() {
|
||||||
}
|
}
|
||||||
|
|
||||||
chrootdir="$1"; shift
|
chrootdir="$1"; shift
|
||||||
pkgs="$@"
|
pkgs=("$@")
|
||||||
|
|
||||||
SVNPATH='svn+ssh://repos.archlinux.org/srv/repos/svn-packages/svn'
|
SVNPATH='svn+ssh://repos.archlinux.org/srv/repos/svn-packages/svn'
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ cd "$REBUILD_ROOT"
|
||||||
/usr/bin/svn co -N $SVNPATH
|
/usr/bin/svn co -N $SVNPATH
|
||||||
|
|
||||||
FAILED=""
|
FAILED=""
|
||||||
for pkg in $pkgs; do
|
for pkg in "${pkgs[@]}"; do
|
||||||
cd "$REBUILD_ROOT/svn-packages"
|
cd "$REBUILD_ROOT/svn-packages"
|
||||||
|
|
||||||
msg2 "Building '%s'" "$pkg"
|
msg2 "Building '%s'" "$pkg"
|
||||||
|
|
Loading…
Reference in New Issue