[Demudi-commits] r428 - in demudi-cfengine/trunk: . chunks debian scripts
Free Ekanayaka
free-guest@costa.debian.org
Wed, 09 Mar 2005 13:54:42 +0100
Author: free-guest
Date: 2005-03-09 13:54:40 +0100 (Wed, 09 Mar 2005)
New Revision: 428
Added:
demudi-cfengine/trunk/scripts/fluxbox
Modified:
demudi-cfengine/trunk/cfagent.conf.in
demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc
demudi-cfengine/trunk/debian/changelog
demudi-cfengine/trunk/scripts/apt
demudi-cfengine/trunk/scripts/bash
Log:
demudi-cfengine:
* Added script to configure fluxbox key bindings
* Updated default APT configuration
* Included many useful bash aliases in bash.bashrc
Modified: demudi-cfengine/trunk/cfagent.conf.in
===================================================================
--- demudi-cfengine/trunk/cfagent.conf.in 2005-03-09 11:52:40 UTC (rev 427)
+++ demudi-cfengine/trunk/cfagent.conf.in 2005-03-09 12:54:40 UTC (rev 428)
@@ -18,8 +18,8 @@
end = ( "### END DEMUDI" )
comment = ( "# these lines were automatically edited by demudi-cfengine, don't touch!" )
chunks = ( "/usr/share/demudi-cfengine/chunks" )
- snapshot = ( "deb http://snapshot.debian.net/archive/2004/12/17/debian/ testing main" )
- agnula = ( "deb http://apt.agnula.org/demudi stable local" )
+ debian = ( "deb http://ftp.debian.org/debian testing main" )
+ agnula = ( "deb http://apt.agnula.org/demudi stable main local" )
#
# Decides what to be done and in which sequence
Modified: demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc
===================================================================
--- demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc 2005-03-09 11:52:40 UTC (rev 427)
+++ demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc 2005-03-09 12:54:40 UTC (rev 428)
@@ -1,23 +1,50 @@
-if [ -f /usr/share/doc/bash/examples/startup-files/bashrc ]; then
- . /usr/share/doc/bash/examples/startup-files/bashrc
-fi
-
if [ "$PS1" ]; then
- MARK=$(if [ $(id -u) -eq 0 ]; then echo \#; else echo \$; fi)
- PS1="\[[36m\]\u \[[32m\]\w \[[0;1m\]$MARK\[[0m\] "
-fi
+ if [ -f /usr/share/doc/bash/examples/startup-files/bashrc ]; then
+ . /usr/share/doc/bash/examples/startup-files/bashrc
+ fi
-export LS_COLORS='no=00:fi=00:di=01;36:ln=01;36:pi=40;33:so=01;35:bd=40;33;01:\
-cd=40;33;01:or=01;05;37;41:mi=01;05;37;41:ex=01;32:*.cmd=01;32:*.exe=01;32:\
-*.com=01;32:*.btm=01;32:*.bat=01;32:*.tar=04;31:*.tgz=04;33:*.arj=04;33:\
-*.taz=04;33:*.lzh=04;33:*.zip=04;33:*.z=04;33:*.Z=04;33:*.gz=04;33:*.deb=04;33:\
-*.rpm=04;33:*.jpg=01;35:*.gif=01;35:*.bmp=01;35:*.xbm=01;35:*.xpm=01;35:*.ps=01;32:\
-*.pdf=01;32:*.wav=01;39:*.mp3=01;37:*.c=01;33:*.h=01;39:'
+ if [ "$PS1" ]; then
+ MARK=$(if [ $(id -u) -eq 0 ]; then echo \#; else echo \$; fi)
+ PS1="\[[36m\]\u \[[32m\]\w \[[0;1m\]$MARK\[[0m\] "
+ fi
+
+ export LS_COLORS='no=00:fi=00:di=01;36:ln=01;36:pi=40;33:so=01;35:bd=40;33;01:\
+ cd=40;33;01:or=01;05;37;41:mi=01;05;37;41:ex=01;32:*.cmd=01;32:*.exe=01;32:\
+ *.com=01;32:*.btm=01;32:*.bat=01;32:*.tar=04;31:*.tgz=04;33:*.arj=04;33:\
+ *.taz=04;33:*.lzh=04;33:*.zip=04;33:*.z=04;33:*.Z=04;33:*.gz=04;33:*.deb=04;33:\
+ *.rpm=04;33:*.jpg=01;35:*.gif=01;35:*.bmp=01;35:*.xbm=01;35:*.xpm=01;35:*.ps=01;32:\
+ *.pdf=01;32:*.wav=01;39:*.mp3=01;37:*.c=01;33:*.h=01;39:'
-eval `dircolors -b`
-alias ls='ls --color=auto'
-alias ll='ls -l'
-alias la='ls -A'
-alias l='ls -CF'
+ eval `dircolors -b`
-export HISTSIZE=50000
+ alias ls='ls --color=auto'
+ alias ll='ls -l'
+ alias la='ls -A'
+ alias l='ls -CF'
+
+ export HISTSIZE=50000
+
+ alias tarx="tar xfz"
+ alias tart="tar tfz"
+ alias ts='date "+%d_%b_%Y"'
+ alias trunc="cat /dev/null > "
+ alias reload='. ~/.bashrc'
+
+ alias which="type -path"
+ alias joe="if [ ! -d $HOME/.backup ]; then mkdir $HOME/.backup; fi; \
+ /usr/bin/joe -backpath $HOME/.backup -columns 100 -rmargin 120 -asis"
+ alias logm='tail /var/log/messages'
+ alias rgrep="grep -n -d recurse . -e"
+ alias sfind="find . -name"
+ alias du="du -s -h"
+ alias c="clear"
+ alias mountiso='mount -t iso9660 -o ro,loop'
+ alias mc="mc -c"
+
+ alias svn-build="svn-buildpackage --svn-tag --svn-move -rfakeroot"
+
+ function svn-commit () {
+ message=$(svn diff --no-diff-deleted debian/changelog | grep -v -e "^++" | grep -e "^+.*" | cut -b 2- | grep -e "^ \* " | sed -e "s/\* /\n * /g")
+ svn commit -m "$(basename $(pwd)): $message"
+ }
+fi
Modified: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog 2005-03-09 11:52:40 UTC (rev 427)
+++ demudi-cfengine/trunk/debian/changelog 2005-03-09 12:54:40 UTC (rev 428)
@@ -1,3 +1,11 @@
+demudi-cfengine (0.17) unstable; urgency=low
+
+ * Added script to configure fluxbox key bindings
+ * Updated default APT configuration
+ * Included many useful bash aliases in bash.bashrc
+
+ -- Free Ekanayaka <free@agnula.org> Mon, 7 Mar 2005 11:48:38 +0100
+
demudi-cfengine (0.16) unstable; urgency=low
* Run cfagent only if a specific script exists for the packages passed
Modified: demudi-cfengine/trunk/scripts/apt
===================================================================
--- demudi-cfengine/trunk/scripts/apt 2005-03-09 11:52:40 UTC (rev 427)
+++ demudi-cfengine/trunk/scripts/apt 2005-03-09 12:54:40 UTC (rev 428)
@@ -33,6 +33,9 @@
InsertLine "# A/DeMuDi packages"
InsertLine "#$(agnula)"
InsertLine ""
+ InsertLine "# Whole Debian archive"
+ InsertLine "#$(debian)"
+ InsertLine ""
IncrementPointer "1"
DeleteToLineMatching "$(end)"
}
Modified: demudi-cfengine/trunk/scripts/bash
===================================================================
--- demudi-cfengine/trunk/scripts/bash 2005-03-09 11:52:40 UTC (rev 427)
+++ demudi-cfengine/trunk/scripts/bash 2005-03-09 12:54:40 UTC (rev 428)
@@ -65,6 +65,11 @@
#
# Delete the old hack if present
#
+ CommentLinesMatching "^ *PS1=.*"
+
+ #
+ # Delete the old hack if present
+ #
LocateLineMatching " $(begin)"
DeleteToLineMatching " $(end)"
DeleteLinesMatching " $(end)"
Added: demudi-cfengine/trunk/scripts/fluxbox
===================================================================
--- demudi-cfengine/trunk/scripts/fluxbox 2005-03-09 11:52:40 UTC (rev 427)
+++ demudi-cfengine/trunk/scripts/fluxbox 2005-03-09 12:54:40 UTC (rev 428)
@@ -0,0 +1,18 @@
+editfiles:
+
+ { /etc/X11/fluxbox/keys
+ AppendIfNoSuchLine "Control Mod1 Right :NextWorkspace"
+ AppendIfNoSuchLine "Control Mod1 Left :PrevWorkspace"
+ AppendIfNoSuchLine "Control Shift r :ExecCommand fbrun"
+ AppendIfNoSuchLine "Control Shift m :RootMenu"
+ AppendIfNoSuchLine "Control Shift x :Close"
+ AppendIfNoSuchLine "Control Shift d :ToggleDecor"
+ AppendIfNoSuchLine "Control Shift Left :MoveLeft 5"
+ AppendIfNoSuchLine "Control Shift Right :MoveRight 5"
+ AppendIfNoSuchLine "Control Shift Up :MoveUp 5"
+ AppendIfNoSuchLine "Control Shift Down :MoveDown 5"
+ AppendIfNoSuchLine "Control Mod1 Left :ResizeHorizontal -5"
+ AppendIfNoSuchLine "Control Mod1 Right :ResizeHorizontal 5"
+ AppendIfNoSuchLine "Control Mod1 Up :ResizeVertical -5"
+ AppendIfNoSuchLine "Control Mod1 Down :ResizeVertical 5"
+}