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

Fix issues with force mode

Browse Source
This commit is contained in:
Pierre Pronchery 2015-06-02 20:43:30 +02:00
parent 3c312f79f5
commit c80e98c574
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/deforaos-package.sh
View File

@ -278,8 +278,6 @@ _package_debian()
pkgname=$(echo "$DEBIAN_PREFIX$PACKAGE" | $TR A-Z a-z) pkgname=$(echo "$DEBIAN_PREFIX$PACKAGE" | $TR A-Z a-z)
[ -n "$PREFIX" ] || PREFIX="/usr" [ -n "$PREFIX" ] || PREFIX="/usr"
([ $FORCE -eq 0 ] || $DEBUG $RM -r -- ".pc" "debian") || return 2
#check for changes #check for changes
_info "Checking for changes..." _info "Checking for changes..."
_package_diff || return 2 _package_diff || return 2
@ -287,10 +285,6 @@ _package_debian()
#cleanup #cleanup
$DEBUG $MAKE distclean || return 2 $DEBUG $MAKE distclean || return 2
#initialization
$DEBUG $MKDIR -- "debian" "debian/source" || return 2
#create the source archive #create the source archive
_info "Creating the source archive..." _info "Creating the source archive..."
if [ ! -f "../${pkgname}_${VERSION}.orig.tar.gz" ]; then if [ ! -f "../${pkgname}_${VERSION}.orig.tar.gz" ]; then
@ -319,11 +313,15 @@ _package_debian()
[ -n "$license" ] || _warning "Unknown license" [ -n "$license" ] || _warning "Unknown license"
#debian files #debian files
[ $FORCE -eq 0 ] || for i in $DEBIAN_FILES; do if [ $FORCE -ne 0 ]; then
$DEBUG $RM -- ".pc" || return 2
$DEBUG $RM -r -- "debian" || return 2
fi
[ -d "debian" ] || for i in $DEBIAN_FILES; do
_info "Creating debian/$i..." _info "Creating debian/$i..."
$DEBUG $MKDIR -- "debian" || return 2
"_debian_$i" > "debian/$i" "_debian_$i" > "debian/$i"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
$DEBUG $RM -r -- "debian"
_error "Could not create debian/$i" _error "Could not create debian/$i"
return 2 return 2
fi fi
@ -333,7 +331,6 @@ _package_debian()
_info "Creating debian/changelog..." _info "Creating debian/changelog..."
_debian_changelog _debian_changelog
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
[ $FORCE -eq 0 ] || $DEBUG $RM -r -- "debian"
_error "Could not create debian/changelog" _error "Could not create debian/changelog"
return 2 return 2
fi fi
@ -345,6 +342,7 @@ _package_debian()
_debian_menu _debian_menu
#debian/source/format #debian/source/format
$DEBUG $MKDIR -- "debian/source" || return 2
_debian_source_format > "debian/source/format" _debian_source_format > "debian/source/format"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
[ $FORCE -eq 0 ] || $DEBUG $RM -r -- "debian" [ $FORCE -eq 0 ] || $DEBUG $RM -r -- "debian"
@ -497,7 +495,8 @@ _debian_install()
[ -n "$major" ] || return 0 [ -n "$major" ] || return 0
#FIXME some files may be missed (or absent) #FIXME some files may be missed (or absent)
$CAT > "debian/$pkgname$major.install" << EOF if [ $FORCE -ne 0 -o ! -f "debian/$pkgname${major}.install" ]; then
$CAT > "debian/$pkgname${major}.install" << EOF
usr/bin/* usr/bin/*
usr/lib/lib*.so.$major usr/lib/lib*.so.$major
usr/lib/lib*.so.$major.* usr/lib/lib*.so.$major.*
@ -505,14 +504,17 @@ usr/share/doc/*
usr/share/man/html1/* usr/share/man/html1/*
usr/share/man/man1/* usr/share/man/man1/*
EOF EOF
fi
$CAT > "debian/$pkgname-dev.install" << EOF if [ $FORCE -ne 0 -o ! -f "debian/$pkgname-dev.install" ]; then
$CAT > "debian/$pkgname-dev.install" << EOF
usr/include/* usr/include/*
usr/lib/lib*.a usr/lib/lib*.a
usr/lib/lib*.so usr/lib/lib*.so
usr/lib/pkgconfig/*.pc usr/lib/pkgconfig/*.pc
usr/share/gtk-doc/html/* usr/share/gtk-doc/html/*
EOF EOF
fi
} }
_debian_lintian() _debian_lintian()
@ -550,6 +552,7 @@ _debian_menu()
[ -z "$menus" ] && return 0 [ -z "$menus" ] && return 0
#debian/menu #debian/menu
[ $FORCE -eq 0 -a -f "debian/menu" ] && return 0
_info "Creating debian/menu..." _info "Creating debian/menu..."
$TOUCH "debian/menu" || return 2 $TOUCH "debian/menu" || return 2
for i in $menus; do for i in $menus; do