diff options
| -rwxr-xr-x[-rw-r--r--] | docker/debian-dev/bootstrap/bash-profile/bash-completion.bash (renamed from docker/debian-dev/bootstrap/bash-profile-bash-completion.bash) | 0 | ||||
| -rwxr-xr-x | docker/debian-dev/bootstrap/bash-profile/dquilt.bash | 3 | ||||
| -rw-r--r-- | docker/debian-dev/bootstrap/quiltrc-dpkg | 13 | ||||
| -rwxr-xr-x | docker/debian-dev/bootstrap/setup-base.bash | 2 | ||||
| -rwxr-xr-x | docker/debian-dev/bootstrap/setup-dev-tools.bash | 5 |
5 files changed, 21 insertions, 2 deletions
diff --git a/docker/debian-dev/bootstrap/bash-profile-bash-completion.bash b/docker/debian-dev/bootstrap/bash-profile/bash-completion.bash index 75f8333..75f8333 100644..100755 --- a/docker/debian-dev/bootstrap/bash-profile-bash-completion.bash +++ b/docker/debian-dev/bootstrap/bash-profile/bash-completion.bash diff --git a/docker/debian-dev/bootstrap/bash-profile/dquilt.bash b/docker/debian-dev/bootstrap/bash-profile/dquilt.bash new file mode 100755 index 0000000..a0a469b --- /dev/null +++ b/docker/debian-dev/bootstrap/bash-profile/dquilt.bash @@ -0,0 +1,3 @@ +alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg" +. /usr/share/bash-completion/completions/quilt +complete -F _quilt_completion $_quilt_complete_opt dquilt diff --git a/docker/debian-dev/bootstrap/quiltrc-dpkg b/docker/debian-dev/bootstrap/quiltrc-dpkg new file mode 100644 index 0000000..e8fc3c5 --- /dev/null +++ b/docker/debian-dev/bootstrap/quiltrc-dpkg @@ -0,0 +1,13 @@ +d=. +while [ ! -d $d/debian -a `readlink -e $d` != / ]; + do d=$d/..; done +if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then + # if in Debian packaging tree with unset $QUILT_PATCHES + QUILT_PATCHES="debian/patches" + QUILT_PATCH_OPTS="--reject-format=unified" + QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto" + QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index" + QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:" + QUILT_COLORS="${QUILT_COLORS}diff_ctx=35:diff_cctx=33" + if ! [ -d $d/debian/patches ]; then mkdir $d/debian/patches; fi +fi diff --git a/docker/debian-dev/bootstrap/setup-base.bash b/docker/debian-dev/bootstrap/setup-base.bash index 1176592..d94b92f 100755 --- a/docker/debian-dev/bootstrap/setup-base.bash +++ b/docker/debian-dev/bootstrap/setup-base.bash @@ -4,5 +4,5 @@ set -e apt-get install -y vim less man curl bash-completion -cat /bootstrap/bash-profile-bash-completion.bash > /root/.bash_profile +cat /bootstrap/bash-profile/bash-completion.bash >> /root/.bash_profile diff --git a/docker/debian-dev/bootstrap/setup-dev-tools.bash b/docker/debian-dev/bootstrap/setup-dev-tools.bash index 67d8494..e66cf94 100755 --- a/docker/debian-dev/bootstrap/setup-dev-tools.bash +++ b/docker/debian-dev/bootstrap/setup-dev-tools.bash @@ -2,5 +2,8 @@ set -e -apt-get install -y build-essential debhelper cpio kmod git bc python bison flex rsync libelf-dev libssl-dev libncurses-dev dwarves +apt-get install -y build-essential debhelper quilt cpio kmod git bc python bison flex rsync libelf-dev libssl-dev libncurses-dev dwarves + +cp /boostrap/quiltrc-dpkg /root/.quiltrc-dpkg +cat /bootstrap/bash-profile/dquilt.bash >> /root/.bash_profile |