fixed bug #126

parent 7cde12e0
...@@ -18,7 +18,7 @@ export_result () ...@@ -18,7 +18,7 @@ export_result ()
echo -e "MODE=\"$MODE\"\ echo -e "MODE=\"$MODE\"\
\nPREFIX=\"$PREFIX\"\ \nPREFIX=\"$PREFIX\"\
\nDATADIR=\"$PREFIX/share/bashstyle-ng/\"\ \nDATADIR=\"$PREFIX/share/bashstyle-ng/\"\
\nDATADIR_LIST=( ui data rc/{,ascii,bin,dirinfo,functions,generator,internal,settings,styles,wizard} terminfo/{,b,m,n} vim/{,colors} )\ \nDATADIR_LIST=( ui data rc/{,ascii,bin,dirinfo,functions,generator,internal,opt,settings,styles,wizard} terminfo/{,b,m,n} vim/{,colors} )\
\nPROFILEDIR=\"/etc/profile.d/\"\ \nPROFILEDIR=\"/etc/profile.d/\"\
\nBINDIR=\"$PREFIX/bin\"\ \nBINDIR=\"$PREFIX/bin\"\
\nLOCALEDIR=\"$PREFIX/share/locale/\"\ \nLOCALEDIR=\"$PREFIX/share/locale/\"\
......
...@@ -29,6 +29,12 @@ gconfd_kill () { ...@@ -29,6 +29,12 @@ gconfd_kill () {
} }
remove_old_wrappers () {
rm -f $DESTDIR/$PREFIX/share/bashstyle-ng/rc/bin/{rm,mv,cp,shred}
}
post_install () { post_install () {
if [[ ! $DISABLE_POSTINSTALL ]]; then if [[ ! $DISABLE_POSTINSTALL ]]; then
...@@ -37,6 +43,7 @@ post_install () { ...@@ -37,6 +43,7 @@ post_install () {
register_schemas --install register_schemas --install
update_cache update_cache
gconfd_kill gconfd_kill
remove_old_wrappers
fi fi
......
...@@ -27,7 +27,8 @@ DOC_FILES=( docs/*.html:${DOCDIR} ...@@ -27,7 +27,8 @@ DOC_FILES=( docs/*.html:${DOCDIR}
{AUTHORS,COPYING.CODE,COPYING.ICONS,CREDITS,NEWS,README}:${DOCDIR} ) {AUTHORS,COPYING.CODE,COPYING.ICONS,CREDITS,NEWS,README}:${DOCDIR} )
BIN_FILES=( data/bashstyle:${BINDIR} BIN_FILES=( data/bashstyle:${BINDIR}
rc/bin/*:${DATADIR}/rc/bin ) rc/bin/*:${DATADIR}/rc/bin
rc/opt/*:${DATADIR}/rc/opt )
PROFILE_FILES=( data/bashstyle.sh:${PROFILEDIR} ) PROFILE_FILES=( data/bashstyle.sh:${PROFILEDIR} )
......
...@@ -3,6 +3,12 @@ Overview of changes in v7.12.1 "Do You Like The Sound Now?" ...@@ -3,6 +3,12 @@ Overview of changes in v7.12.1 "Do You Like The Sound Now?"
=== Bug Fixes === === Bug Fixes ===
* 125 (ui): change the way the GUI retrieves it's own version and * 125 (ui): change the way the GUI retrieves it's own version and
prefix, fixes possible startup-failures on foreign setups prefix, fixes possible startup-failures on foreign setups
* 126 (dirinfo-wrappers): even if the dirinfo-wrappers were disabled,
they could interfere with the original rm,
mv, cp and shred tools. If you updated from
version 7.12, please restart your machine
after you installed 7.12.1, to ensure every-
thing is fine with your setup.
=== Added Features === === Added Features ===
* batch [TJ Carter] * batch [TJ Carter]
......
...@@ -10,17 +10,19 @@ ...@@ -10,17 +10,19 @@
export WANT_DIRINFO_FLAGS="@DIRINFO_ENABLE@" export WANT_DIRINFO_FLAGS="@DIRINFO_ENABLE@"
export CP_CMD=$(which cp)
export MV_CMD=$(which mv)
export RM_CMD=$(which rm)
export SH_CMD=$(which shred)
export SH_OPTS="-uvz"
export GAME_PATH="/usr/games:/usr/local/games" export GAME_PATH="/usr/games:/usr/local/games"
export OLD_PATH="$PATH" export OLD_PATH="$PATH"
export BSNG_PATH="@PREFIX@/share/bashstyle-ng/rc/bin/" export BSNG_PATH="@PREFIX@/share/bashstyle-ng/rc/bin/"
export PATH="$BSNG_PATH:$OLD_PATH:$GAME_PATH:." export PATH="$BSNG_PATH:$OLD_PATH:$GAME_PATH:."
if [[ ! $WANT_DIRINFO_FLAGS == "false" ]]; then
export CP_CMD=$(which cp)
export MV_CMD=$(which mv)
export RM_CMD=$(which rm)
export SH_CMD=$(which shred)
export SH_OPTS="-uvz"
export PATH="@PREFIX@/share/bashstyle-ng/rc/opt/:$PATH"
fi
export CONFIG_SHELL="/bin/bash" export CONFIG_SHELL="/bin/bash"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment