fixes #1564 usr home

src/cmd/create.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/user"
 	"path/filepath"
 	"strings"
 	"time"
@@ -300,13 +301,26 @@ func createContainer(container, image, release, authFile string, showCommandToEn
 
 	dbusSystemSocketMountArg := dbusSystemSocket + ":" + dbusSystemSocket
 
-	homeDirEvaled, err := filepath.EvalSymlinks(currentUser.HomeDir)
+	user, err := user.Current()
+	if err != nil{
+		logrus.Errorf("Failed to get HOME directory: %v", err)
+	}
+	homeDir := user.HomeDir
+	resolvedPath, err := filepath.EvalSymlinks(HomeDir)
+	if err != nil{
+		logrus.Errorf("Failed to evaluate symlinks for HOME directory: %v", err)
+		return err
+	}
+
+
+	/*homeDirEvaled = os.UserHomeDir()
+	homeDirEvaled, err := filepath.EvalSymlinks(homeDirEvaled)
 	if err != nil {
 		return fmt.Errorf("failed to canonicalize %s", currentUser.HomeDir)
 	}
 
 	logrus.Debugf("%s canonicalized to %s", currentUser.HomeDir, homeDirEvaled)
-	homeDirMountArg := homeDirEvaled + ":" + homeDirEvaled + ":rslave"
+	homeDirMountArg := homeDirEvaled + ":" + homeDirEvaled + ":rslave"*/
 
 	var avahiSocketMount []string
 

src/cmd/help.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+
 
 	"github.com/containers/toolbox/pkg/utils"
 	"github.com/spf13/cobra"

src/cmd/initContainer.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/user"
 	"path/filepath"
 	"strconv"
 	"strings"

src/cmd/rootMigrationPath.go

@@ -23,6 +23,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/user"
 	"strings"
 
 	"github.com/containers/toolbox/pkg/utils"

src/cmd/run.go

@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/user"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -441,7 +442,7 @@ func runCommandWithFallbacks(container string,
 
 					workDir = runFallbackWorkDirs[runFallbackWorkDirsIndex]
 					if workDir == "" {
-						workDir = currentUser.HomeDir
+						workDir = user.Current()
 					}
 
 					fmt.Fprintf(os.Stderr, "Using %s instead.\n", workDir)

src/cmd/utils.go

@@ -25,6 +25,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/user"
 	"os/exec"
 	"os/user"
 	"path/filepath"