nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A little discipline: locals, better redirect etc.

Browse source
This commit is contained in:
Alec Leamas 2010-10-10 16:38:01 +02:00
parent 0b305a03e9
commit 075a39cfce
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkg/fedora/make-dist.sh
View file

@ -14,16 +14,16 @@ function git_id
# Usage: git_id [-n] [file or directory] # Usage: git_id [-n] [file or directory]
# #
{ {
nl="\n" local nl="\n"
file_or_dir="$PWD" local file_or_dir="$PWD"
test "$1" = '-n' && { nl=""; shift; } test "$1" = '-n' && { nl=""; shift; }
test -n "$1" && file_or_dir="$1" test -n "$1" && file_or_dir="$1"
if [ -d $file_or_dir ]; then if [ -d $file_or_dir ]; then
file="" local file=""
dir=$file_or_dir local dir=$file_or_dir
else else
file=$(basename $file_or_dir) local file=$(basename $file_or_dir)
dir=$(dirname $file_or_dir) local dir=$(dirname $file_or_dir)
fi fi
export LANG=C export LANG=C
@ -51,7 +51,7 @@ function fix_alphatag()
# Patches:\ # Patches:\
# * Fri Sep 24 2010 name surname <email@com> 1.20100925_faf23207 # * Fri Sep 24 2010 name surname <email@com> 1.20100925_faf23207
{ {
dist=$(rpm --eval %dist) local dist=$(rpm --eval %dist)
awk -v dist="$dist" -v version="$2" -v release="$3" \ awk -v dist="$dist" -v version="$2" -v release="$3" \
' BEGIN { done = 0 } ' BEGIN { done = 0 }
/^[*]/ { if (done) /^[*]/ { if (done)
@ -92,8 +92,8 @@ function patch()
-e '/^Version:/s|.*|Version: '$1'|' \ -e '/^Version:/s|.*|Version: '$1'|' \
<diaspora.spec >dist/diaspora.spec <diaspora.spec >dist/diaspora.spec
fix_alphatag dist/diaspora.spec $1 $2 fix_alphatag dist/diaspora.spec $1 $2
bundle_id=$(git_id dist/diaspora/Gemfile) local bundle_id=$(git_id dist/diaspora/Gemfile)
dist_tag=$(rpm --eval %dist) local dist_tag=$(rpm --eval %dist)
fix_bundle_deps dist/diaspora.spec $1 "1.${bundle_id}$dist_tag" fix_bundle_deps dist/diaspora.spec $1 "1.${bundle_id}$dist_tag"
sed -e "/^%define/s|HEAD|$bundle_id|" \ sed -e "/^%define/s|HEAD|$bundle_id|" \
-e '/^Version:/s|.*|Version: '$1'|' \ -e '/^Version:/s|.*|Version: '$1'|' \
@ -107,7 +107,7 @@ function checkout()
# Usage: checkout [commit id, defaults to HEAD] # Usage: checkout [commit id, defaults to HEAD]
# Returns: commit for current branch's HEAD. # Returns: commit for current branch's HEAD.
{ {
mkdir dist >/dev/null 2>&1 || : mkdir dist &>/dev/null || :
( (
cd dist cd dist
test -d diaspora || { test -d diaspora || {
@ -194,13 +194,13 @@ function make_bundle()
function make_links() function make_links()
# Usage: make_links [source commit] # Usage: make_links [source commit]
{ {
dest=$(rpm --eval %_sourcedir) local dest=$(rpm --eval %_sourcedir)
test -z "$dest" && { test -z "$dest" && {
echo "Can't find RPM source directory, giving up." echo "Can't find RPM source directory, giving up."
exit 2 exit 2
} }
src_commit="${1:-$( checkout)}" local src_commit="${1:-$( checkout)}"
echo "Linking sources for $src_commit to $dest" echo "Linking sources for $src_commit to $dest"
src="dist/diaspora-$VERSION-$src_commit.tar.gz" src="dist/diaspora-$VERSION-$src_commit.tar.gz"
@ -211,8 +211,8 @@ function make_links()
EOF EOF
ln -sf $PWD/$src $dest ln -sf $PWD/$src $dest
bundle_commit=$(git_id dist/diaspora/Gemfile) local bundle_commit=$(git_id dist/diaspora/Gemfile)
bundle="dist/diaspora-bundle-$VERSION-$bundle_commit.tar.gz" local bundle="dist/diaspora-bundle-$VERSION-$bundle_commit.tar.gz"
test -e $bundle || test -e $bundle ||
cat <<- EOF cat <<- EOF
Warning: $bundle does not exist Warning: $bundle does not exist
@ -220,6 +220,7 @@ function make_links()
EOF EOF
ln -sf $PWD/$bundle $dest ln -sf $PWD/$bundle $dest
local file
for file in $( grep -v '^#' SOURCES); do for file in $( grep -v '^#' SOURCES); do
if [ -e "$file" ]; then if [ -e "$file" ]; then
ln -sf $PWD/$file $dest/$file ln -sf $PWD/$file $dest/$file