update tran, trying fixing home path for windows #42

README.md

@@ -82,7 +82,7 @@ tran sync start
 
 ### Tran Config file
 
-> tran config file is located at `~/.config/tran/tran.yml` | `$HOME/tran.yml`
+> tran config file is located at `~/.tran/tran.yml`
 
 ```yml
 config:

app/config/config.go

@@ -14,7 +14,7 @@ import (
 
 var (
  homeDir, _ = dfs.GetHomeDirectory()
- tranConfigPath = filepath.Join(homeDir, ".config", "tran", "tran.yml")
+ tranConfigPath = filepath.Join(homeDir, ".tran", "tran.yml")
  tranConfig, err = ioutil.ReadFile(tranConfigPath)
 )
 

app/sync.go

@@ -25,7 +25,7 @@ var (
  Short: "Start sync your tran config.",
  Run: func(cmd *cobra.Command, args []string) {
  if username != ":username" {
- exCmd := "echo '# My tran config - " + username + "\n\n## Clone\n\n```\ntran sync clone\n```\n\n**for more about sync command, run `tran sync -h`**' >> $HOME/.config/tran/README.md"
+ exCmd := "echo '# My tran config - " + username + "\n\n## Clone\n\n```\ntran sync clone\n```\n\n**for more about sync command, run `tran sync -h`**' >> $HOME/.tran/README.md"
 
  gosh.Run(exCmd)
  gosh.RunMulti(constants.Start_ml(), constants.Start_w())
@@ -134,7 +134,7 @@ func PushSync() {
  if runtime.GOOS == "windows" {
  err, out, errout := gosh.PowershellOutput(
  `
- $directoyPath = "~/.config/tran/.git"
+ $directoyPath = "~/.tran/.git"
 
  if (Test-Path -path $directoyPath) {
  Write-Host "Reading from .tran folder..."
@@ -158,7 +158,7 @@ func PushSync() {
  } else {
  err, out, errout := gosh.ShellOutput(
  `
- if [ -d ~/.config/tran/.git ]; then
+ if [ -d ~/.tran/.git ]; then
  echo "📖 Reading from .tran folder..."
  fi
  `)

constants/commands.go

@@ -2,15 +2,15 @@ package constants
 
 func Fetch_w() string {
  return `
- Remove-Item $HOME\.config\tran -Recurse -Force
+ Remove-Item $HOME\.tran -Recurse -Force
  tran sync fetchx
  Write-Host "Fetched Successfully"
  `
 }
 
 func Fetch_ml() string {
  return `
- cd $HOME/.config/tran
+ cd $HOME/.tran
  git pull
  echo "Fetched Successfully ✅"
  `
@@ -19,7 +19,7 @@ func Fetch_ml() string {
 func Start_w() string {
  return `
  $username = tran auth get-username
- cd $HOME\.config\tran
+ cd $HOME\.tran
  git init
  tran gh-repo create .tran -d "My tran config - $username" --private -y
  git add .
@@ -34,7 +34,7 @@ func Start_w() string {
 func Start_ml() string {
  return `
  username=$(tran auth get-username)
- cd ~/.config/tran
+ cd ~/.tran
  git init
  tran gh-repo create .tran -d "My tran config - $username" --private -y
  git add .
@@ -48,7 +48,7 @@ func Start_ml() string {
 func Push_w() string {
  return `
  $lastDir = pwd
- cd $HOME\.config\tran
+ cd $HOME\.tran
  if (Test-Path -path .git) {
  git add .
  git commit -m "new change"
@@ -61,7 +61,7 @@ func Push_w() string {
 
 func Push_ml() string {
  return `
- cd ~/.config/tran
+ cd ~/.tran
  git add .
  git commit -m "new tran config"
  git push
@@ -71,7 +71,7 @@ func Push_ml() string {
 func Pull_w() string {
  return `
  $lastDir = pwd
- cd $HOME\.config\tran
+ cd $HOME\.tran
 
  git pull
 
@@ -81,14 +81,14 @@ func Pull_w() string {
 
 func Pull_ml() string {
  return `
- cd ~/.config/tran
+ cd ~/.tran
  git pull
  `
 }
 
 func Clone_w() string {
  return `
- $TRANDIR = $HOME\.config\tran
+ $TRANDIR = $HOME\.tran
 
  if (Test-Path -path $TRANDIR) {
  Remove-Item $TRANDIR -Recurse -Force
@@ -100,7 +100,7 @@ func Clone_w() string {
 
 func Clone_ml() string {
  return `
- TRANDIR=~/.config/tran
+ TRANDIR=~/.tran
 
  if [ -d $TRANDIR ]; then
  rm -rf $TRANDIR
@@ -112,12 +112,12 @@ func Clone_ml() string {
 
 func Clone_check_w() string {
  return `
- if (Test-Path -path $HOME\.config\tran) {
+ if (Test-Path -path $HOME\.tran) {
  Write-Host "tran repo cloned successfully"
  }
  `
 }
 
 func Clone_check_ml() string {
- return `if [ -d $HOME/.config/tran ]; then echo "tran repo cloned successfully ✅"; fi`
+ return `if [ -d $HOME/.tran ]; then echo "tran repo cloned successfully ✅"; fi`
 }

internal/config/config.go

@@ -34,7 +34,7 @@ func defualtEditor() string {
 }
 
 // LoadConfig loads a users config and creates the config if it does not exist
-// located at `~/.config/tran.yml`
+// located at `~/.tran/tran.yml`
 func LoadConfig(startDir *pflag.Flag) {
  var err error
 
@@ -44,12 +44,17 @@ func LoadConfig(startDir *pflag.Flag) {
  log.Fatal(err)
  }
 
- err = dfs.CreateDirectory(filepath.Join(homeDir, ".config", "tran"))
+ err = dfs.CreateDirectory(filepath.Join(homeDir, ".tran"))
  if err != nil {
  log.Fatal(err)
  }
 
- viper.AddConfigPath("$HOME/.config/tran")
+ viper.AddConfigPath("$HOME/.tran")
+
+ if runtime.GOOS == "windows" {
+ viper.AddConfigPath(`$USERPROFILE\\.tran`)
+ }
+
  viper.SetConfigName("tran")
  viper.SetConfigType("yml")