Revision: 55074
http://brlcad.svn.sourceforge.net/brlcad/?rev=55074&view=rev
Author: jordisayol
Date: 2013-04-08 00:18:12 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
Properly update the environment variable $MANPATH on deb and rpm packages.
Modified Paths:
--------------
brlcad/trunk/misc/debian/brlcad.postinst
brlcad/trunk/misc/debian/brlcad.sh
brlcad/trunk/sh/make_rpm.sh
Modified: brlcad/trunk/misc/debian/brlcad.postinst
===================================================================
--- brlcad/trunk/misc/debian/brlcad.postinst 2013-04-06 21:55:50 UTC (rev
55073)
+++ brlcad/trunk/misc/debian/brlcad.postinst 2013-04-08 00:18:12 UTC (rev
55074)
@@ -23,6 +23,4 @@
fi
fi
-source /etc/profile.d/brlcad.sh || :
-
update-mime-database /usr/share/mime || :
Modified: brlcad/trunk/misc/debian/brlcad.sh
===================================================================
--- brlcad/trunk/misc/debian/brlcad.sh 2013-04-06 21:55:50 UTC (rev 55073)
+++ brlcad/trunk/misc/debian/brlcad.sh 2013-04-08 00:18:12 UTC (rev 55074)
@@ -10,11 +10,14 @@
export PATH=${PATH}:${BRLCAD_PATH}
fi
-if [ -z "$MANPATH" ]
-then
- export MANPATH=${BRLCAD_MANPATH}
# check if $BRLCAD_MANPATH is already in $MANPATH
-elif echo $MANPATH | awk -F: -v j=$BRLCAD_MANPATH '{for(i=1;i<=NF;i++){if($i
== j){exit 1}}}'
+if echo $MANPATH | awk -F: -v j=$BRLCAD_MANPATH '{for(i=1;i<=NF;i++){if($i ==
j){exit 1}}}'
then
- export MANPATH=${MANPATH}:${BRLCAD_MANPATH}
+ # check if $MANPATH ends with a colon
+ if [ "${MANPATH#${MANPATH%?}}" == ":" ]
+ then
+ export MANPATH=${MANPATH}${BRLCAD_MANPATH}:
+ else
+ export MANPATH=${MANPATH}:${BRLCAD_MANPATH}
+ fi
fi
Modified: brlcad/trunk/sh/make_rpm.sh
===================================================================
--- brlcad/trunk/sh/make_rpm.sh 2013-04-06 21:55:50 UTC (rev 55073)
+++ brlcad/trunk/sh/make_rpm.sh 2013-04-08 00:18:12 UTC (rev 55074)
@@ -255,8 +255,6 @@
fi
fi
-source /etc/profile.d/brlcad.sh || :
-
update-mime-database /usr/share/mime || :
update-desktop-database -q || :
gtk-update-icon-cache -qf /usr/share/icons/hicolor || :' >> $TMPDIR/brlcad.spec
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
