Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit ca6a50e

Browse files
killianmuldoonprzemeklal
killianmuldoon
authored andcommitted
edited shellscripts for static analysis
1 parent 3f46989 commit ca6a50e

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Diff for: scripts/.usrsp-docker-run.sh.swp

12 KB
Binary file not shown.

Diff for: scripts/dpdk-docker-run.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
#
1414

1515
scriptpath=$GOPATH/src/github.com/containernetworking/cni/scripts
16-
echo $scriptpath
16+
echo "$scriptpath"
1717

18-
contid=$(docker run -d --net=none $@ /bin/sleep 10000000)
19-
pid=$(docker inspect -f '{{ .State.Pid }}' $contid)
18+
contid=$(docker run -d --net=none "$@" /bin/sleep 10000000)
19+
pid=$(docker inspect -f '{{ .State.Pid }}' "$contid")
2020
netnspath=/proc/$pid/ns/net
2121

22-
$scriptpath/exec-plugins.sh add $contid $netnspath
22+
"$scriptpath"/exec-plugins.sh add "$contid" "$netnspath"
2323

2424
function cleanup() {
25-
$scriptpath/exec-plugins.sh del $contid $netnspath
26-
docker rm -f $contid >/dev/null
25+
"$scriptpath"/exec-plugins.sh del "$contid" "$netnspath"
26+
docker rm -f "$contid" >/dev/null
2727
}
2828
trap cleanup EXIT
2929

@@ -35,7 +35,7 @@ trucContid=${contid:0:12}
3535
docker run -i -t -v /var/lib/cni/usrspcni/shared:/var/lib/cni/usrspcni/shared:rw \
3636
-v /dev/hugepages:/dev/hugepages \
3737
dpdk-app-testpmd testpmd -l 0-1 -n 4 -m 1024 --no-pci \
38-
--vdev=virtio_user0,path=/var/lib/cni/usrspcni/shared/$trucContid-eth0 \
38+
--vdev=virtio_user0,path=/var/lib/cni/usrspcni/shared/"$trucContid"-eth0 \
3939
--file-prefix=container \
4040
-- -i --txqflags=0xf00 --disable-hw-vlan --port-topology=chained
4141

Diff for: scripts/usrsp-docker-run.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
#
1818

1919
scriptpath=$GOPATH/src/github.com/containernetworking/cni/scripts
20-
echo $scriptpath
20+
echo "$scriptpath"
2121

22-
contid=$(docker run -d --net=none $@ /bin/sleep 10000000)
23-
pid=$(docker inspect -f '{{ .State.Pid }}' $contid)
22+
contid=$(docker run -d --net=none "$@" /bin/sleep 10000000)
23+
pid=$(docker inspect -f '{{ .State.Pid }}' "$contid")
2424
netnspath=/proc/$pid/ns/net
2525

26-
$scriptpath/exec-plugins.sh add $contid $netnspath
26+
"$scriptpath"/exec-plugins.sh add "$contid" "$netnspath"
2727

2828
function cleanup() {
29-
$scriptpath/exec-plugins.sh del $contid $netnspath
30-
docker rm -f $contid >/dev/null
29+
"$scriptpath"/exec-plugins.sh del "$contid" "$netnspath"
30+
docker rm -f "$contid" >/dev/null
3131
}
3232
trap cleanup EXIT
3333

3434
docker run \
3535
-v /var/lib/cni/usrspcni/shared:/var/lib/cni/usrspcni/shared:rw \
36-
-v /var/lib/cni/usrspcni/$contid:/var/lib/cni/usrspcni/data:rw \
36+
-v /var/lib/cni/usrspcni/"$contid":/var/lib/cni/usrspcni/data:rw \
3737
--device=/dev/hugepages:/dev/hugepages \
38-
--net=container:$contid $@
38+
--net=container:"$contid" "$@"
3939

0 commit comments

Comments
 (0)