aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-08-22 04:29:16 (GMT)
committerrathnor <rathnor>2004-08-22 04:29:16 (GMT)
commit94c823f9977e1cd457d31dbd6fb54f3397ef424d (patch)
treeeb9feb4f8dab053168446df76a9bd7481222624a
parent84505e56e2e8fee2454d3492782d08d555256e09 (diff)
downloadfluxbox-94c823f9977e1cd457d31dbd6fb54f3397ef424d.zip
fluxbox-94c823f9977e1cd457d31dbd6fb54f3397ef424d.tar.bz2
don't look for icons in ~ if installing
-rwxr-xr-xutil/fluxbox-generate_menu.in16
1 files changed, 10 insertions, 6 deletions
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index a41ecbd..666ea35 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -22,7 +22,7 @@
22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23# DEALINGS IN THE SOFTWARE. 23# DEALINGS IN THE SOFTWARE.
24# 24#
25# $Id: fluxbox-generate_menu.in,v 1.27 2004/08/22 03:45:03 rathnor Exp $ 25# $Id: fluxbox-generate_menu.in,v 1.28 2004/08/22 04:29:16 rathnor Exp $
26 26
27# 27#
28# Portability notes: 28# Portability notes:
@@ -143,12 +143,16 @@ case `uname` in
143esac 143esac
144 144
145append() { 145append() {
146 echo -n " $*" >> ${MENUFILENAME} 146 if [ -z "${INSTALL}" ]; then
147 execname="`echo $*|cut -d\( -f2|cut -d\) -f1`" 147 echo -n " $*" >> ${MENUFILENAME}
148 if [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then 148 execname="`echo $*|cut -d\( -f2|cut -d\) -f1`"
149 echo "<${HOME}/.fluxbox/icons/$execname.xpm>" >> ${MENUFILENAME} 149 if [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
150 echo "<${HOME}/.fluxbox/icons/$execname.xpm>" >> ${MENUFILENAME}
151 else
152 echo >> ${MENUFILENAME}
153 fi
150 else 154 else
151 echo >> ${MENUFILENAME} 155 echo " $*" >> ${MENUFILENAME}
152 fi 156 fi
153} 157}
154 158