aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2012-09-28 20:24:39 -0400
committerRobby Workman <rworkman@slackbuilds.org>2012-09-29 17:17:40 -0500
commita9df89a5db47bc7e6bda28b205a6fb1155bfa4cb (patch)
treee4028b13c39828757effec3ff4386451e0fe5a45
parent4d26f60eedc8d6685b273cebb9a23227eddb66c0 (diff)
desktop/i3: Fixed (Don't clobber config files)
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/i3/doinst.sh3
-rw-r--r--desktop/i3/i3.SlackBuild8
2 files changed, 8 insertions, 3 deletions
diff --git a/desktop/i3/doinst.sh b/desktop/i3/doinst.sh
index 601b5500c3e1e..d5e0f114d2678 100644
--- a/desktop/i3/doinst.sh
+++ b/desktop/i3/doinst.sh
@@ -12,6 +12,9 @@ config() {
}
config etc/i3/config.new
+config etc/i3/welcome.new
+config etc/i3/config.keycodes.new
+config etc/X11/xinit/xinitrc.i3.new
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild
index b0317bcec73ec..322a67cce944c 100644
--- a/desktop/i3/i3.SlackBuild
+++ b/desktop/i3/i3.SlackBuild
@@ -8,7 +8,7 @@
PRGNAM=i3
VERSION="4.2"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
@@ -69,6 +69,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
# Don't clobber the default config
mv $PKG/etc/i3/config $PKG/etc/i3/config.new
+mv $PKG/etc/i3/config.keycodes $PKG/etc/i3/config.keycodes.new
+mv $PKG/etc/i3/welcome $PKG/etc/i3/welcome.new
# Make xterm default terminal
sed -i 's/urxvt/xterm/' $PKG/etc/i3/config.new
@@ -79,8 +81,8 @@ ln -s $PKG/usr/share/xsessions/i3.desktop $PKG/usr/share/apps/kdm/sessions/
# Install an xinitrc script
mkdir -p $PKG/etc/X11/xinit
-cat $CWD/xinitrc.i3 > $PKG/etc/X11/xinit/xinitrc.i3
-chmod 0755 $PKG/etc/X11/xinit/xinitrc.i3
+cat $CWD/xinitrc.i3 > $PKG/etc/X11/xinit/xinitrc.i3.new
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.i3.new
# Install man pages
mkdir -p $PKG/usr/man/man1