lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Install coloring rules regardless of plugin. Also don't clobber.

Browse Source
This commit is contained in:
Bob Lantz
2014-09-23 14:01:40 -07:00
parent 47be38e63c
commit f603052b35
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/install.sh
+5 -5
View File
@@ -216,8 +216,12 @@ function wireshark {
$install wireshark tshark $install wireshark tshark
fi fi
# Copy coloring rules: OF is white-on-blue:
mkdir -p $HOME/.wireshark
cp -n $MININET_DIR/mininet/util/colorfilters $HOME/.wireshark
echo "Checking Wireshark version" echo "Checking Wireshark version"
WSVER=`wireshark -v | egrep -o '[0-9\.]+' | head -1` WSVER=`wireshark -v | egrep -o -m 1 '[0-9\.]+' | head -1`
if version_ge $WSVER 1.12; then if version_ge $WSVER 1.12; then
echo "Wireshark version $WSVER >= 1.12 - returning" echo "Wireshark version $WSVER >= 1.12 - returning"
return return
@@ -237,10 +241,6 @@ function wireshark {
sudo cp $PLUGIN $WSPLUGDIR sudo cp $PLUGIN $WSPLUGDIR
echo "Copied openflow plugin $PLUGIN to $WSPLUGDIR" echo "Copied openflow plugin $PLUGIN to $WSPLUGDIR"
# Copy coloring rules: OF is white-on-blue:
mkdir -p $HOME/.wireshark
cp $MININET_DIR/mininet/util/colorfilters $HOME/.wireshark
cd $BUILD_DIR cd $BUILD_DIR
} }