From 15ed43a925b00a64319a8281c87d7f2320dc0fa4 Mon Sep 17 00:00:00 2001
From: geco91 <red78@web.de>
Date: Mon, 26 Oct 2020 21:18:11 +0100
Subject: [PATCH] Improve patch & provision for VM (#1717)

---
 .../amd64/packer/scripts/init_vagrant.sh               |  3 +++
 home.admin/XXsyncScripts.sh                            | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/alternative.platforms/amd64/packer/scripts/init_vagrant.sh b/alternative.platforms/amd64/packer/scripts/init_vagrant.sh
index bad737a37..2ead12ece 100644
--- a/alternative.platforms/amd64/packer/scripts/init_vagrant.sh
+++ b/alternative.platforms/amd64/packer/scripts/init_vagrant.sh
@@ -10,9 +10,12 @@ cp /vagrant/home.admin/XXsyncScripts.sh /home/admin/XXsyncScripts.sh
 # execute 'patch' command to sync laptop with VM
 /home/admin/XXsyncScripts.sh -run
 
+source <(/home/admin/config.scripts/internet.sh status)
+
 echo
 echo "************* NEXT ********************"
 echo "vagrant ssh --> ssh into your RaspiBlitzVM"
+echo "ssh admin@${localip} --> ssh into with password A"
 echo "vagrant provision --> trigger code sync from outside VM"
 echo "patch --> trigger code sync from inside the VM"
 echo 
\ No newline at end of file
diff --git a/home.admin/XXsyncScripts.sh b/home.admin/XXsyncScripts.sh
index cb08e645d..1e537d225 100755
--- a/home.admin/XXsyncScripts.sh
+++ b/home.admin/XXsyncScripts.sh
@@ -19,8 +19,8 @@ cd /home/admin/raspiblitz
 source /mnt/hdd/raspiblitz.conf 2>/dev/null
 
 # gather info
-activeGitHubUser=$(sudo -u admin cat /home/admin/raspiblitz/.git/config | grep "url = " | cut -d "=" -f2 | cut -d "/" -f4)
-activeBranch=$(git branch | grep \* | cut -d ' ' -f2)
+activeGitHubUser=$(sudo -u admin cat /home/admin/raspiblitz/.git/config 2>/dev/null | grep "url = " | cut -d "=" -f2 | cut -d "/" -f4)
+activeBranch=$(git branch 2>/dev/null | grep \* | cut -d ' ' -f2)
 
 # if parameter is "info" just give back basic info about sync
 if [ "$1" == "info" ]; then
@@ -135,8 +135,12 @@ else
   echo "# --> VAGRANT IS ACTIVE"
   echo "# *** SYNCING RASPIBLITZ CODE WITH VAGRANT LINKED DIRECTORY ***"
   echo "# This is for developing on your RaspiBlitz with a VM."
+  echo "# - delete /home/admin/raspiblitz"
   sudo rm -r /home/admin/raspiblitz
-  sudo cp -r /vagrant /home/admin/raspiblitz
+  sudo mkdir /home/admin/raspiblitz
+  echo "# - copy from vagrant new raspiblitz files (ignore hidden dirs)"
+  sudo cp -r /vagrant/* /home/admin/raspiblitz
+  echo "# - set admin as owner of files"
   sudo chown admin:admin -R /home/admin/raspiblitz
 fi