mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-11-04 16:04:02 +00:00
edit-patch: Correct indentation to spaces only.
This commit is contained in:
Benjamin Drung
parent
84e2835686
commit
daf1535d05
96
edit-patch
96
edit-patch
@ -44,13 +44,13 @@ fatal_error() {
|
||||
# arg2: error message
|
||||
require_installed() {
|
||||
if ! which "$1" >/dev/null; then
|
||||
fatal_error "$2"
|
||||
fi
|
||||
}
|
||||
fatal_error "$2"
|
||||
fi
|
||||
}
|
||||
|
||||
ensure_debian_dir() {
|
||||
if [ ! -e debian/control ] || [ ! -e debian/rules ]; then
|
||||
fatal_error "Can not find debian/rules or debian/control. Not in a debian dir?"
|
||||
fatal_error "Can not find debian/rules or debian/control. Not in a debian dir?"
|
||||
fi
|
||||
|
||||
}
|
||||
@ -59,18 +59,18 @@ detect_patchsystem() {
|
||||
CDBS_PATCHSYS="^[^#]*simple-patchsys.mk"
|
||||
|
||||
if grep -q "$CDBS_PATCHSYS" debian/rules; then
|
||||
PATCHSYSTEM="cdbs"
|
||||
require_installed cdbs-edit-patch "no cdbs-edit-patch found, is 'cdbs' installed?"
|
||||
PATCHSYSTEM="cdbs"
|
||||
require_installed cdbs-edit-patch "no cdbs-edit-patch found, is 'cdbs' installed?"
|
||||
elif [ -e debian/patches/00list ]; then
|
||||
PATCHSYSTEM="dpatch"
|
||||
require_installed dpatch-edit-patch "no dpatch-edit-patch found, is 'dpatch' installed?"
|
||||
PATCHSYSTEM="dpatch"
|
||||
require_installed dpatch-edit-patch "no dpatch-edit-patch found, is 'dpatch' installed?"
|
||||
elif [ -e debian/patches/series -o \( \
|
||||
-e debian/source/format -a "$(cat debian/source/format)" = "3.0 (quilt)" \) ]; then
|
||||
PATCHSYSTEM="quilt"
|
||||
require_installed quilt "no quilt found, is 'quilt' installed?"
|
||||
PATCHSYSTEM="quilt"
|
||||
require_installed quilt "no quilt found, is 'quilt' installed?"
|
||||
else
|
||||
PATCHSYSTEM="none"
|
||||
PREFIX="debian/applied-patches"
|
||||
PATCHSYSTEM="none"
|
||||
PREFIX="debian/applied-patches"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -86,20 +86,20 @@ normalize_patch_path() {
|
||||
normalize_patch_extension() {
|
||||
# check if we have a patch already
|
||||
if [ -e $PREFIX/$PATCHNAME ]; then
|
||||
echo "Patch $PATCHNAME exists, not normalizing"
|
||||
return
|
||||
echo "Patch $PATCHNAME exists, not normalizing"
|
||||
return
|
||||
fi
|
||||
|
||||
# normalize name for new patches
|
||||
PATCHNAME=${PATCHNAME%.*}
|
||||
if [ "$PATCHSYSTEM" = "quilt" ]; then
|
||||
PATCHNAME="${PATCHNAME}.patch"
|
||||
PATCHNAME="${PATCHNAME}.patch"
|
||||
elif [ "$PATCHSYSTEM" = "cdbs" ]; then
|
||||
PATCHNAME="${PATCHNAME}.patch"
|
||||
PATCHNAME="${PATCHNAME}.patch"
|
||||
elif [ "$PATCHSYSTEM" = "dpatch" ]; then
|
||||
PATCHNAME="${PATCHNAME}.dpatch"
|
||||
elif [ "$PATCHSYSTEM" = "none" ]; then
|
||||
PATCHNAME="${PATCHNAME}.patch"
|
||||
PATCHNAME="${PATCHNAME}.dpatch"
|
||||
elif [ "$PATCHSYSTEM" = "none" ]; then
|
||||
PATCHNAME="${PATCHNAME}.patch"
|
||||
fi
|
||||
|
||||
echo "Normalizing patch name to $PATCHNAME"
|
||||
@ -114,7 +114,7 @@ edit_patch_dpatch() {
|
||||
dpatch-edit-patch $PATCHNAME
|
||||
# add if needed
|
||||
if ! grep -q $1 $PREFIX/00list; then
|
||||
echo "$1" >> $PREFIX/00list
|
||||
echo "$1" >> $PREFIX/00list
|
||||
fi
|
||||
vcs_add $PREFIX/00list $PREFIX/$1
|
||||
}
|
||||
@ -122,18 +122,18 @@ edit_patch_dpatch() {
|
||||
edit_patch_quilt() {
|
||||
export QUILT_PATCHES=debian/patches
|
||||
if [ -e $PREFIX/$1 ]; then
|
||||
# if its a existing patch and we are at the end of the stack,
|
||||
# go back at the beginning
|
||||
if ! quilt unapplied; then
|
||||
quilt pop -a
|
||||
fi
|
||||
quilt push $1
|
||||
# if its a existing patch and we are at the end of the stack,
|
||||
# go back at the beginning
|
||||
if ! quilt unapplied; then
|
||||
quilt pop -a
|
||||
fi
|
||||
quilt push $1
|
||||
else
|
||||
# if its a new patch make sure we are at the end of the stack
|
||||
if quilt unapplied >/dev/null; then
|
||||
quilt push -a
|
||||
fi
|
||||
quilt new $1
|
||||
# if its a new patch make sure we are at the end of the stack
|
||||
if quilt unapplied >/dev/null; then
|
||||
quilt push -a
|
||||
fi
|
||||
quilt new $1
|
||||
fi
|
||||
# use a sub-shell
|
||||
quilt shell
|
||||
@ -144,18 +144,18 @@ edit_patch_quilt() {
|
||||
|
||||
vcs_add() {
|
||||
if [ -d .bzr ]; then
|
||||
bzr add $@
|
||||
bzr add $@
|
||||
elif [ -d .git ];then
|
||||
git add $@
|
||||
git add $@
|
||||
else
|
||||
echo "Remember to add $@ to a VCS if you use one"
|
||||
echo "Remember to add $@ to a VCS if you use one"
|
||||
fi
|
||||
}
|
||||
|
||||
vcs_commit() {
|
||||
# check if debcommit is happy
|
||||
if ! debcommit --noact 2>/dev/null; then
|
||||
return
|
||||
return
|
||||
fi
|
||||
# commit (if the user confirms)
|
||||
debcommit --confirm
|
||||
@ -164,9 +164,9 @@ vcs_commit() {
|
||||
add_changelog() {
|
||||
S="$PREFIX/$1: [DESCRIBE CHANGES HERE]"
|
||||
if head -n1 debian/changelog|grep UNRELEASED; then
|
||||
dch --append "$S"
|
||||
dch --append "$S"
|
||||
else
|
||||
dch --increment "$S"
|
||||
dch --increment "$S"
|
||||
fi
|
||||
# let the user edit it
|
||||
dch --edit
|
||||
@ -175,13 +175,13 @@ add_changelog() {
|
||||
add_patch_tagging() {
|
||||
# check if we have a descripton already
|
||||
if grep "## Description:" $PREFIX/$1; then
|
||||
return
|
||||
return
|
||||
fi
|
||||
# if not, add one
|
||||
RANGE=1,1
|
||||
# make sure we keep the first line (for dpatch)
|
||||
if head -n1 $PREFIX/$1|grep -q '^#'; then
|
||||
RANGE=2,2
|
||||
RANGE=2,2
|
||||
fi
|
||||
sed -i ${RANGE}i"$PATCH_DESC" $PREFIX/$1
|
||||
}
|
||||
@ -189,7 +189,7 @@ add_patch_tagging() {
|
||||
detect_patch_location() {
|
||||
# Checks whether the specified patch exists in debian/patches or on the filesystem
|
||||
FILENAME=${PATCHNAME##*/}
|
||||
|
||||
|
||||
if [ -f "$PREFIX/$FILENAME" ]; then
|
||||
PATCHTYPE="debian"
|
||||
elif [ -f "$PATCHNAME" ]; then
|
||||
@ -213,31 +213,31 @@ stored in debian/patches-applied. Please remember to mention this in your change
|
||||
handle_file_patch() {
|
||||
if [ "$PATCHTYPE" = "file" ]; then
|
||||
[ -f "$PATCHORIG" ] || fatal_error "No patch detected"
|
||||
|
||||
|
||||
if [ "$PATCHSYSTEM" = "none" ]; then
|
||||
# If we're supplied a file and there is no patchsys we apply it directly
|
||||
# and store it in debian/applied patches
|
||||
[ -d $PREFIX ] || mkdir $PREFIX
|
||||
|
||||
|
||||
patch -p0 < "$PATCHORIG"
|
||||
cp "$PATCHORIG" "$PREFIX/$PATCHNAME"
|
||||
else
|
||||
# Patch type is file but there is a patchsys present, so we add it
|
||||
# correctly
|
||||
cp "$PATCHORIG" "$PREFIX/$PATCHNAME"
|
||||
|
||||
|
||||
if [ "$PATCHSYSTEM" = "quilt" ]; then
|
||||
echo "$PATCHNAME" >> $PREFIX/series
|
||||
elif [ "$PATCHSYSTEM" = "dpatch" ]; then
|
||||
echo "$PATCHNAME" >> $PREFIX/00list
|
||||
|
||||
|
||||
# Add the dpatch header to files that don't already have it
|
||||
if ! grep -q "@DPATCH@" "$PREFIX/$PATCHNAME"; then
|
||||
sed -i '1i#! /bin/sh /usr/share/dpatch/dpatch-run\n@DPATCH@' $PREFIX/$PATCHNAME
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Copying and applying new patch. You can now edit the patch or exit the subshell to save."
|
||||
|
||||
echo "Copying and applying new patch. You can now edit the patch or exit the subshell to save."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -249,8 +249,8 @@ handle_file_patch() {
|
||||
main() {
|
||||
# parse args
|
||||
if [ $# -ne 1 ]; then
|
||||
fatal_error "Need exactly one patch name"
|
||||
fi
|
||||
fatal_error "Need exactly one patch name"
|
||||
fi
|
||||
PATCHNAME="$1"
|
||||
# do the work
|
||||
ensure_debian_dir
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user