From 90d07a75d7ca6c625d7739a8bde0efcd6d2135d9 Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Tue, 28 Feb 2023 18:29:46 +0000
Subject: [PATCH] Update dev setup with small improvements

 - ripgrep (rg) and rsync can both be invoked from some
stx/docs tox targets and utilities.

 - override the default editor (nano) with vi.
In the future this will be driven by a yaml variable

- pass in --rebuild when stx-init-env is run.  The build
containers are not always up to date with the latest code.

Story: 2010547
Task: 47211
Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: I1e3b17d57fd537432bc3780759c8a47a2e3b2a5b
---
 dev-env/vagrant/Vagrantfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-env/vagrant/Vagrantfile b/dev-env/vagrant/Vagrantfile
index 18be31a..6fa59cd 100644
--- a/dev-env/vagrant/Vagrantfile
+++ b/dev-env/vagrant/Vagrantfile
@@ -79,10 +79,12 @@ $package_setup = <<PACKAGE_SETUP
   # libxslt1-dev (config)
   # ostree (update)
   # python3-all-dev (config)
+  # ripgrep (docs)
+  # rsync (docs)
   # ruby-dev (stx-puppet)
   # ruby-rubygems (stx-puppet)
   # tox (all)
-  apt-get install -y bc libffi-dev libldap2-dev libsasl2-dev libxml2-dev libxslt1-dev ostree python3-all-dev ruby-rubygems ruby-dev tox
+  apt-get install -y bc libffi-dev libldap2-dev libsasl2-dev libxml2-dev libxslt1-dev ostree python3-all-dev ripgrep rsync ruby-rubygems ruby-dev tox
 
   # pip install some additional components that are helpful for development
   pip3 install bindep
@@ -164,6 +166,8 @@ $user_setup = <<-'USER_SETUP'
     su - ${DEV_USER} -c "mkdir -p ${PATCHES_DIR}"
     echo "export PATCHES_DIR=${PATCHES_DIR}" >> ${PROFILE}
 
+    # override default editor (nano)
+    echo "export EDITOR=vi" >> ${PROFILE}
 
     # STX_BUILD_HOME is the same as the project workspace
     MY_WORKSPACE="${MY_LOCALDISK}/WORKSPACE/${PROJECT}"