From 9c7e1926aabba15ab4d233c03522a8e57a3b592b Mon Sep 17 00:00:00 2001
From: Alexey Rogachevskiy <sfalexrog@gmail.com>
Date: Mon, 3 Aug 2020 19:07:06 +0300
Subject: [PATCH] base_vm, ros_ide_vm: Rename clever to clover

---
 .travis.yml      |  2 +-
 base_vm.json     |  6 +++---
 build.sh         |  4 ++--
 http/preseed.cfg | 10 +++++-----
 ros_ide_vm.json  | 14 +++++++-------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 774785b..d6a2147 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ before_install:
   bionic contrib >> /etc/apt/sources.list" && sudo apt-get update && sudo apt-get
   install build-essential gcc make linux-headers-$(uname -r) virtualbox-6.0 && sudo
   usermod -aG vboxusers $(whoami)
-- mkdir output-virtualbox-iso && pushd output-virtualbox-iso && wget --progress=dot:giga https://github.com/sfalexrog/clever_vm/releases/download/v0_base_vm/clever-devel.ova
+- mkdir output-virtualbox-iso && pushd output-virtualbox-iso && wget --progress=dot:giga https://github.com/sfalexrog/clever_vm/releases/download/v0.1_base_vm/clover-devel.ova
   && popd
 script:
 - "./build.sh"
diff --git a/base_vm.json b/base_vm.json
index 2d033f1..ef30989 100644
--- a/base_vm.json
+++ b/base_vm.json
@@ -1,8 +1,8 @@
 {
   "variables" : {
-    "user": "clever",
-    "password": "clever",
-    "vm-name": "clever-devel"
+    "user": "clover",
+    "password": "clover",
+    "vm-name": "clover-devel"
   },
   "builders": [{
     "type": "virtualbox-iso",
diff --git a/build.sh b/build.sh
index e075c76..a3182ce 100755
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@ fi
 
 echo "--- Using Packer version $(${PACKER} --version)"
 
-if [ ! -f output-virtualbox-iso/clever-devel.ova ]; then
+if [ ! -f output-virtualbox-iso/clover-devel.ova ]; then
     echo "--- Building base image"
     ${PACKER} build -only=virtualbox-iso base_vm.json || true
 fi
@@ -28,6 +28,6 @@ ${PACKER} build ros_ide_vm.json
 echo "--- Marking the VM"
 
 GIT_REV=$(git rev-parse --short HEAD)
-mv ./output-virtualbox-ovf/clever-devel.ova ./output-virtualbox-ovf/clover-devel_v0.20+${GIT_REV}.ova 
+mv ./output-virtualbox-ovf/clover-devel.ova ./output-virtualbox-ovf/clover-devel_v0.20+${GIT_REV}.ova 
 
 echo "--- All done!"
diff --git a/http/preseed.cfg b/http/preseed.cfg
index 79a2e3d..f24fc66 100644
--- a/http/preseed.cfg
+++ b/http/preseed.cfg
@@ -25,7 +25,7 @@ ubiquity console-keymaps-at/variant select  us
 d-i kbd-chooser/method select British English
 
 ### Network
-d-i netcfg/get_hostname string clever-devel
+d-i netcfg/get_hostname string clover-devel
 d-i netcfg/get_domain string unassigned-domain
 
 ### Clock and time zone setup
@@ -41,10 +41,10 @@ d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
 
 ### Account setup
-d-i passwd/user-fullname string clever
-d-i passwd/username string clever
-d-i passwd/user-password password clever
-d-i passwd/user-password-again password clever
+d-i passwd/user-fullname string clover
+d-i passwd/username string clover
+d-i passwd/user-password password clover
+d-i passwd/user-password-again password clover
 d-i passwd/auto-login boolean true
 d-i user-setup/encrypt-home boolean false
 d-i user-setup/allow-password-weak boolean true
diff --git a/ros_ide_vm.json b/ros_ide_vm.json
index dd06eea..607c722 100644
--- a/ros_ide_vm.json
+++ b/ros_ide_vm.json
@@ -1,8 +1,8 @@
 {
   "variables": {
-    "user": "clever",
-    "password": "clever",
-    "vm-name": "clever-devel",
+    "user": "clover",
+    "password": "clover",
+    "vm-name": "clover-devel",
     "scriptsDir": "scripts",
     "assetsDir": "assets"
   },
@@ -41,17 +41,17 @@
   "provisioners": [{
     "type": "file",
     "source": "{{user `assetsDir`}}/background/",
-    "destination": "/home/clever/Pictures"
+    "destination": "/home/{{user `user`}}/Pictures"
   },
   {
     "type": "file",
     "source": "{{user `assetsDir`}}/pictures/",
-    "destination": "/home/clever/Pictures"
+    "destination": "/home/{{user `user`}}/Pictures"
   },
   {
     "type": "file",
     "source": "{{user `assetsDir`}}/desktop/",
-    "destination": "/home/clever/Desktop"
+    "destination": "/home/{{user `user`}}/Desktop"
   },
   {
     "type": "file",
@@ -71,6 +71,6 @@
   {
     "type": "file",
     "source": "{{user `assetsDir`}}/vscode/",
-    "destination": "/home/clever/.config/Code/User/"
+    "destination": "/home/{{user `user`}}/.config/Code/User/"
   }]
 }
\ No newline at end of file