Merge branch 'master' into feature/gdb-server-rewrite

plutonium-dbg · Aug 31, 2018 · 466924d · 466924d
2 parents 9e0a2e8 + ede7603
commit 466924d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ Contributions to plutonium-dbg are always welcome! If you encounter a bug or hav
 
 ## License
 
-plutonium-dbg, including the GDB server is released under the GPLv2 (or, at your choice, any later version).
+plutonium-dbg, including the GDB server, is released under the GPLv2 (or, at your choice, any later version).
 
 ----
 

diff --git a/setup/build-vm.sh b/setup/build-vm.sh
@@ -83,15 +83,15 @@ EOF
 cat > "$ROOT/ssh.sh" << EOF
 #!/bin/sh
 VMPATH="\$(dirname "\$(readlink -f "\$0")")"
-ssh -i "$VMPATH/id_rsa" -p 20022 -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" root@localhost
+ssh -i "\$VMPATH/id_rsa" -p 20022 -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" root@localhost
 EOF
 
 cat > "$ROOT/scp.sh" << EOF
 #!/bin/bash
 VMPATH="\$(dirname "\$(readlink -f "\$0")")"
 FILES=\${@:1:\$#-1}
 TARGET=\${@:\$#}
-scp -i "$VMPATH/id_rsa" -P 20022 -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" \$FILES "root@localhost:\$TARGET"
+scp -i "\$VMPATH/id_rsa" -P 20022 -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" \$FILES "root@localhost:\$TARGET"
 EOF
 
 chmod a+x "$ROOT/run.sh" "$ROOT/ssh.sh" "$ROOT/scp.sh"
-Original file line number
+Diff line change
@@ Expand Up @@
     ## License
-    plutonium-dbg, including the GDB server is released under the GPLv2 (or, at your choice, any later version).
+    plutonium-dbg, including the GDB server, is released under the GPLv2 (or, at your choice, any later version).
     ----
@@ Expand Down @@