Move copy config code so it happens after the code is downloaded
diff --git a/onos-setup.sh b/onos-setup.sh
index 7d19677..3143eea 100644
--- a/onos-setup.sh
+++ b/onos-setup.sh
@@ -37,3 +37,13 @@
sudo su -c 'echo GRUB_CMDLINE_LINUX_DEFAULT=\"quiet splash\" >> /etc/default/grub'
sudo su -c update-grub
+
+#--------------- Copy SDNIP code to home -----
+
+cp -r /home/tutorial1/onos-next/tools/test/topos/sdnip /home/sdnip/
+cp -r /home/sdnip/sdnip/configs /home/sdnip/
+
+# -------------- Copy SDN-IP config ----------
+
+sudo -u tutorial1 cp /home/sdnip/configs/addresses.json /opt/onos/config/
+sudo -u tutorial1 cp /home/sdnip/configs/sdnip.json /opt/onos/config/
diff --git a/sdnip-setup.sh b/sdnip-setup.sh
index 8bad2ae..0124c79 100644
--- a/sdnip-setup.sh
+++ b/sdnip-setup.sh
@@ -7,11 +7,6 @@
export CURRENT_USER=sdnip
export USER_HOME=/home/${CURRENT_USER}
-#--------------- Copy SDNIP code to home -----
-
-cp -r /home/tutorial1/onos-next/tools/test/topos/sdnip ${USER_HOME}/
-cp -r ${USER_HOME}/sdnip/configs ${USER_HOME}/
-
# -------------- Setup keys -------------------
mkdir -p ~/.ssh
@@ -90,7 +85,3 @@
Comment[en_US]=
EOF
-# -------------- Copy SDN-IP config ----------
-
-sudo -u tutorial1 cp ${USER_HOME}/configs/addresses.json /opt/onos/config/
-sudo -u tutorial1 cp ${USER_HOME}/configs/sdnip.json /opt/onos/config/