highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-04-13 06:09:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve patch & provision for VM (#1717)

Browse Source
This commit is contained in:
geco91 2020-10-26 21:18:11 +01:00 committed by rootzoll
parent 9ce74cdf58
commit 15ed43a925
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alternative.platforms/amd64/packer/scripts/init_vagrant.sh
View File

@ -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

10
home.admin/XXsyncScripts.sh
View File

@ -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