DeforaOS/scripts
DeforaOS/scripts
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2015-05-28 20:24:10 +02:00
parent e538b82e4b
commit b7acf31266
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/deforaos-package.sh
View File

@ -80,11 +80,11 @@ _deforaos_package()
_error "Could not determine the package name or version" _error "Could not determine the package name or version"
return $? return $?
fi fi
[ -z "$METHOD" ] && _package_guess_method [ -n "$METHOD" ] || _package_guess_method
[ -z "$LICENSE" ] && _package_guess_license [ -n "$LICENSE" ] || _package_guess_license
_package_guess_dependencies _package_guess_dependencies
[ -z "$EMAIL" ] && _package_guess_email [ -n "$EMAIL" ] || _package_guess_email
[ -z "$FULLNAME" ] && _package_guess_fullname [ -n "$FULLNAME" ] || _package_guess_fullname
#call the proper packaging function #call the proper packaging function
case "$METHOD" in case "$METHOD" in
@ -210,7 +210,7 @@ _package_debian()
license="GPL-3" license="GPL-3"
;; ;;
esac esac
[ -z "$license" ] && _warning "Unknown license" [ -n "$license" ] || _warning "Unknown license"
#debian files #debian files
for i in $DEBIAN_FILES; do for i in $DEBIAN_FILES; do
@ -261,8 +261,8 @@ _package_debian()
_debian_changelog() _debian_changelog()
{ {
[ -z "$DEBFULLNAME" ] && DEBFULLNAME="$FULLNAME" [ -n "$DEBFULLNAME" ] || DEBFULLNAME="$FULLNAME"
[ -z "$DEBEMAIL" ] && DEBEMAIL="$EMAIL" [ -n "$DEBEMAIL" ] || DEBEMAIL="$EMAIL"
DEBFULLNAME="$DEBFULLNAME" DEBEMAIL="$DEBEMAIL" $DCH --create \ DEBFULLNAME="$DEBFULLNAME" DEBEMAIL="$DEBEMAIL" $DCH --create \
--distribution "unstable" \ --distribution "unstable" \
--package "$pkgname" --newversion "$VERSION-$revision" \ --package "$pkgname" --newversion "$VERSION-$revision" \
@ -400,7 +400,7 @@ _debian_lintian()
for i in "../${pkgname}_$VERSION-${revision}_$arch.deb" \ for i in "../${pkgname}_$VERSION-${revision}_$arch.deb" \
"../$pkgname$major_$VERSION-${revision}_$arch.deb" \ "../$pkgname$major_$VERSION-${revision}_$arch.deb" \
"../$pkgname-dev_$VERSION-${revision}_$arch.deb"; do "../$pkgname-dev_$VERSION-${revision}_$arch.deb"; do
[ ! -f "$i" ] && continue [ -f "$i" ] || continue
$DEBUG $LINTIAN "$i" $DEBUG $LINTIAN "$i"
#XXX ignore errors if the command is not installed #XXX ignore errors if the command is not installed