[pkg-eucalyptus-commits] [euca2ools] 21/41: Fix bad globbing in man page generator script

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch master
in repository euca2ools.

commit f891b9a7e78ded7013a89d88103303d3f8e7d1ba
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Aug 20 15:32:02 2013 -0700

    Fix bad globbing in man page generator script
    
    Fixes the cause of TOOLS-372
---
 generate-manpages.sh |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/generate-manpages.sh b/generate-manpages.sh
index eeb0ca1..d287cb7 100755
--- a/generate-manpages.sh
+++ b/generate-manpages.sh
@@ -3,12 +3,13 @@
 mkdir -p man
 export PYTHONPATH=".:$PYTHONPATH"
 
-version="$(build/*/euca-version 2>&1 | sed -e 's/^euca2ools *\([^(]*\).*/\1/' -e 's/ *$//')"
+py_version=$(python -c 'import sys; print ".".join(map(str, sys.version_info[:2]))')
+script_dir="build/scripts-$py_version"
+version="$($script_dir/euca-version 2>&1 | sed -e 's/^euca2ools *\([^(]*\).*/\1/' -e 's/ *$//')"
 
 for exe in $@; do
-    description="$(build/*/$exe --help 2>&1 | python -c 'import sys; print sys.stdin.read().split("\n\n")[1]')"
-    #version="$(build/*/$exe --version 2>&1 | sed -e 's/^euca2ools *\([^(]*\).*/\1/' -e 's/ *$//')"
-    help2man -N --no-discard-stderr -S "euca2ools $version" -n "$description" --version-string "$version" -o man/$(basename $exe).1 build/*/$exe
+    description="$($script_dir/$exe --help 2>&1 | python -c 'import sys; print sys.stdin.read().split("\n\n")[1]')"
+    help2man -N --no-discard-stderr -S "euca2ools $version" -n "$description" --version-string "$version" -o man/$(basename $exe).1 $script_dir/$exe
     sed -i -e 's/^.SH DESCRIPTION/.SH SYNOPSIS/' \
            -e 's/usage: *//' \
            -e '/^\.IP/{/^\.IP/d}' \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-eucalyptus/euca2ools.git