Skip to content

Commit

Permalink
Revert "Moving openbox config to a system-wide place"
Browse files Browse the repository at this point in the history
This reverts commit ad471d6.
  • Loading branch information
pazdera committed Apr 28, 2014
1 parent 61f644f commit 9150c91
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion debian/install
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Copyright etc/skel
config/lxpanel/* usr/share/kano-desktop/config/lxpanel
config/pcmanfm/* usr/share/kano-desktop/config/pcmanfm

config/openbox/* usr/share/lxde/openbox/
config/openbox/* usr/share/kano-desktop/openbox

config/rxvt/x11-rxvt etc/X11/Xresources

Expand Down
7 changes: 7 additions & 0 deletions debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
lightdm_greeter_config=/etc/lightdm/lightdm-gtk-greeter.conf
custom_lightdm_greeter_config=/usr/share/kano-desktop/lightdm/lightdm-gtk-greeter.conf

openbox_rc=/etc/xdg/openbox/rc.xml
custom_openbox_rc=/usr/share/kano-desktop/openbox/rc.xml

lightdm_config=/etc/lightdm/lightdm.conf

chromium_master_prefs=/etc/chromium/master_preferences
Expand Down Expand Up @@ -41,6 +44,10 @@ case "$1" in
ln -s /usr/share/kano-desktop/config/pcmanfm /etc/skel/.config/pcmanfm
ln -s /usr/share/kano-desktop/config/lxpanel /etc/skel/.config/lxpanel

# Configure openbox
cp $openbox_rc $openbox_rc-old
cat $custom_openbox_rc > $openbox_rc

# Configure lightdm
cp $lightdm_greeter_config $lightdm_greeter_config-old
cat $custom_lightdm_greeter_config > $lightdm_greeter_config
Expand Down
7 changes: 7 additions & 0 deletions debian/postrm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
# License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
#

openbox_rc=/etc/xdg/openbox/rc.xml

lightdm_greeter_config=/etc/lightdm/lightdm_gtk_greeter.conf
lightdm_config=/etc/lightdm/lightdm.conf

Expand All @@ -20,6 +22,11 @@ sudo rm -r /usr/share/squeak
case "$1" in
remove|upgrade)

# Revert old openbox config
if [ -e "$openbox_rc-old" ]; then
mv $openbox_rc-old $openbox_rc
fi

# Revert old lightdm greeter config
if [ -e "$lightdm_greeter_config-old" ]; then
mv $lightdm_greeter_config-old $lightdm_greeter_config
Expand Down

0 comments on commit 9150c91

Please sign in to comment.