clean the previous mounts by removing the mount from the vm (using um…

…ount)

cmd/mount.go

@@ -21,13 +21,19 @@ import (
 	"github.com/mhewedy/vermin/vms"
 	"github.com/spf13/cobra"
 	"os"
+	"strings"
 )
 
 // mountCmd represents the mount command
 var mountCmd = &cobra.Command{
 	Use:   "mount",
 	Short: "Mount local filesystem inside the VM",
-	Long: `Mount local filesystem to /vermin directory inside the VM
+	Long: `Mount local filesystem to a directory inside the VM, 
+if the guest directory is not specified, then /vermin is used
+
+Usage: vermin mount <vm> local dir:[<vm dir>]
+
+default <vm dir> is /vermin
 
 Note: 
 1. You can mount as many times as you want, and each time overrides old mounts.
@@ -36,13 +42,23 @@ Note:
 	Example: `
 To mount the ~/Downloads directory to /vermin inside the VM:
 $ vermin mount vm_01 ~/Downloads
+
+To mount the ~/MyHtmlProject directory to /var/www/html inside the VM:
+$ vermin mount vm_01 ~/MyHtmlProject:/var/www/html
 `,
 	Run: func(cmd *cobra.Command, args []string) {
 		vmName := args[0]
-		hostPath := args[1]
+
+		p := strings.Split(args[1], ":")
+		hostPath := p[0]
 		checkFilePath(hostPath)
 
-		err := vms.Mount(vmName, hostPath)
+		guestPath := "/vermin"
+		if len(p) > 1 {
+			guestPath = p[1]
+		}
+
+		err := vms.Mount(vmName, hostPath, guestPath)
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)

vms/mount.go

@@ -1,6 +1,7 @@
 package vms
 
 import (
+	"errors"
 	"fmt"
 	"github.com/mhewedy/vermin/command"
 	"github.com/mhewedy/vermin/command/ssh"
@@ -9,10 +10,11 @@ import (
 	"github.com/mhewedy/vermin/images"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 )
 
-func Mount(vmName string, hostPath string) error {
+func Mount(vmName, hostPath, guestPath string) error {
 	if err := checkRunningVM(vmName); err != nil {
 		return err
 	}
@@ -35,7 +37,6 @@ func Mount(vmName string, hostPath string) error {
 		return err
 	}
 
-	guestFolder := "/vermin"
 	shareName := strconv.FormatInt(time.Now().Unix(), 10)
 
 	if _, err = command.VBoxManage("sharedfolder",
@@ -46,12 +47,12 @@ func Mount(vmName string, hostPath string) error {
 		"--transient",
 		"--automount",
 		"--auto-mount-point",
-		guestFolder).Call(); err != nil {
+		guestPath).Call(); err != nil {
 		return err
 	}
 
-	mountCmd := fmt.Sprintf("sudo mkdir -p %s; ", guestFolder) +
-		fmt.Sprintf("sudo mount -t vboxsf -o uid=1000,gid=1000 %s %s", shareName, guestFolder)
+	mountCmd := fmt.Sprintf("sudo mkdir -p %s; ", guestPath) +
+		fmt.Sprintf("sudo mount -t vboxsf -o uid=1000,gid=1000 %s %s", shareName, guestPath)
 
 	if _, err = ssh.Execute(vmName, mountCmd); err != nil {
 		return err
@@ -67,11 +68,30 @@ func removeMounts(vmName string) error {
 	}
 
 	for i := range transientMounts {
-		mount := transientMounts[i]
-		if _, err = command.VBoxManage("sharedfolder", "remove", vmName, "--name", mount, "--transient").Call(); err != nil {
+		mountName := transientMounts[i]
+		if _, err = command.VBoxManage("sharedfolder", "remove", vmName, "--name", mountName, "--transient").Call(); err != nil {
 			return err
 		}
+		if guestPath, err := getMountGuestPath(vmName, mountName); err == nil {
+			_, _ = ssh.Execute(vmName, "sudo umount "+guestPath)
+		}
 	}
 
 	return nil
 }
+
+// return guestPath of mount
+func getMountGuestPath(vmName, mountName string) (string, error) {
+	mountData, _ := ssh.Execute(vmName, "sudo mount")
+	mounts := strings.Split(mountData, "\n")
+
+	for _, line := range mounts {
+		if strings.HasPrefix(line, mountName) {
+			fields := strings.Fields(line)
+			if len(fields) > 3 {
+				return fields[2], nil
+			}
+		}
+	}
+	return "", errors.New("cannot get mount path")
+}