From 2d9f32c3df1860b395801fa941ba74ca4f3dab3c Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 7 Apr 2018 09:00:52 -0400
Subject: [PATCH 1/2] Move dev executables  from util/ to bin/dev/

---
 {util => bin/dev}/friendica-to-smarty-tpl.py | 0
 {util => bin/dev}/make_credits.py            | 0
 {util => bin/dev}/minifyjs.sh                | 0
 {util => bin/dev}/updatetpl.py               | 0
 {util => bin/dev}/vagrant_provision.sh       | 2 +-
 {util => bin/dev}/vagrant_vhost.sh           | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename {util => bin/dev}/friendica-to-smarty-tpl.py (100%)
 rename {util => bin/dev}/make_credits.py (100%)
 rename {util => bin/dev}/minifyjs.sh (100%)
 rename {util => bin/dev}/updatetpl.py (100%)
 rename {util => bin/dev}/vagrant_provision.sh (98%)
 rename {util => bin/dev}/vagrant_vhost.sh (100%)

diff --git a/util/friendica-to-smarty-tpl.py b/bin/dev/friendica-to-smarty-tpl.py
similarity index 100%
rename from util/friendica-to-smarty-tpl.py
rename to bin/dev/friendica-to-smarty-tpl.py
diff --git a/util/make_credits.py b/bin/dev/make_credits.py
similarity index 100%
rename from util/make_credits.py
rename to bin/dev/make_credits.py
diff --git a/util/minifyjs.sh b/bin/dev/minifyjs.sh
similarity index 100%
rename from util/minifyjs.sh
rename to bin/dev/minifyjs.sh
diff --git a/util/updatetpl.py b/bin/dev/updatetpl.py
similarity index 100%
rename from util/updatetpl.py
rename to bin/dev/updatetpl.py
diff --git a/util/vagrant_provision.sh b/bin/dev/vagrant_provision.sh
similarity index 98%
rename from util/vagrant_provision.sh
rename to bin/dev/vagrant_provision.sh
index 836d12368..fc3e266f2 100755
--- a/util/vagrant_provision.sh
+++ b/bin/dev/vagrant_provision.sh
@@ -35,7 +35,7 @@ sudo openssl x509 -req -days 365 -in "$SSL_DIR/xip.io.csr" -signkey "$SSL_DIR/xi
 echo ">>> Installing Apache2 webserver"
 sudo apt-get install -y apache2
 sudo a2enmod rewrite actions ssl
-sudo cp /vagrant/util/vagrant_vhost.sh /usr/local/bin/vhost
+sudo cp /vagrant/bin/dev/vagrant_vhost.sh /usr/local/bin/vhost
 sudo chmod guo+x /usr/local/bin/vhost
     sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica.local
     sudo a2dissite 000-default
diff --git a/util/vagrant_vhost.sh b/bin/dev/vagrant_vhost.sh
similarity index 100%
rename from util/vagrant_vhost.sh
rename to bin/dev/vagrant_vhost.sh

From 12b5963f22ddad68fd5b0b8610c3def9505afb7a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 7 Apr 2018 09:01:40 -0400
Subject: [PATCH 2/2] Update Vagrant script path

---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 853daba0f..e5f30b307 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -37,7 +37,7 @@ Vagrant.configure(2) do |config|
   end
 
   # Enable provisioning with a shell script.
-  config.vm.provision "shell", path: "./util/vagrant_provision.sh"
+  config.vm.provision "shell", path: "./bin/dev/vagrant_provision.sh"
     # run: "always"
     # run: "once"
 end