diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index ecead6e0f2398c3537f18e8901256b6d3f0c78e1..f3813ae90e6da2f8cca7d09366824d50c8e97cb4 100755 (executable)
--- a/gosa-core/dh-make-gosa
+++ b/gosa-core/dh-make-gosa
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
usage() {
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
usage() {
- echo "Usage: ${0##*/} [--download] [--section section name] [-b|--branch branch] [-e|--email mail] [--depends] plugin-dir|plugin.tar.gz" >&2
+ echo "Usage: ${0##*/} [--section section name] [-b|--branch branch] [-e|--email mail] [--depends] plugin-dir|plugin.tar.gz" >&2
exit 1
}
exit 1
}
# Untar
mkdir -p "$TMPDIR"
# Untar
mkdir -p "$TMPDIR"
- tar --extract --directory "$TMPDIR" -fz "$file" &> /dev/null
+ tar --extract --directory "$TMPDIR" -fz "$file" >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Error: cannot extract plugin file - invalid file format" >&2
exit 5
if [ $? -ne 0 ]; then
echo "Error: cannot extract plugin file - invalid file format" >&2
exit 5
read -s -n 1 -p "Do you want to continue? (y/n)" ans; echo
[ "$ans" != "y" ] && exit 0
read -s -n 1 -p "Do you want to continue? (y/n)" ans; echo
[ "$ans" != "y" ] && exit 0
-pushd . &> /dev/null
-
cd "$BUILD_PATH"
# Use gosa-plugin skelleton
echo "Calling dh_make..."
cd "$BUILD_PATH"
# Use gosa-plugin skelleton
echo "Calling dh_make..."
-echo | dh_make -e "$PL_MAIL" -c gpl -s -n -f gosa-plugin-${PL_NAME}-${PL_VERSION}.tar.gz &> /dev/null
+echo | dh_make -e "$PL_MAIL" -c gpl -s -n -f gosa-plugin-${PL_NAME}-${PL_VERSION}.tar.gz >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Failed to call dh_make - aborting!"
exit 1
if [ $? -ne 0 ]; then
echo "Failed to call dh_make - aborting!"
exit 1
# Generate install file
for dir in admin personal addons gofax gofon generic; do
# Generate install file
for dir in admin personal addons gofax gofon generic; do
- [ -d $dir ] && printf "$dir\t\t\t/usr/share/gosa/plugins" >> debian/install
+ [ -d $dir ] && printf "$dir\t\t\t/usr/share/gosa/plugins\n" >> debian/install
done
for dir in help/*; do
done
for dir in help/*; do
- printf "$dir\t\t\t/usr/share/gosa/doc/plugins/$PL_NAME" >> debian/install
+ printf "$dir\t\t\t/usr/share/gosa/doc/plugins/$PL_NAME\n" >> debian/install
done
for dir in $(ls -1 locale | grep -v "^en$" | grep -v "^messages.po$"); do
done
for dir in $(ls -1 locale | grep -v "^en$" | grep -v "^messages.po$"); do
- printf "locale/$dir\t\t\t/usr/share/gosa/locale/plugins/$PL_NAME" >> debian/install
+ printf "locale/$dir\t\t\t/usr/share/gosa/locale/plugins/$PL_NAME\n" >> debian/install
done
# Generate dirs
done
# Generate dirs
done
# Remove examples
done
# Remove examples
-rm debian/*ex debian/*EX &> /dev/null
-
-popd &> /dev/null
+rm debian/*ex debian/*EX >/dev/null 2>&1
echo "Done."
echo "Done."