diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 54f8f7f..d3a0dab 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -22,7 +22,7 @@ Steps to reproduce the behavior: * SCM : github * Type : org * Protocol : https - * Location : /Users/user/Desktop/ghorg/ + * Location : $HOME/ghorg * Concurrency : 25 * Ghorgignore : /Users/user/.config/ghorg/ghorgignore * Config Used : /Users/user.config/ghorg/conf.yaml @@ -32,7 +32,7 @@ Steps to reproduce the behavior: 75 repos found in my-org ``` - + 1. Details on the user/org you tried to clone e.g. is it your user, a public org, etc. **Screenshots** diff --git a/cmd/root.go b/cmd/root.go index 5587779..4e541b1 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,10 +6,11 @@ import ( "os" "path/filepath" - "github.com/gabrie30/ghorg/colorlog" - "github.com/gabrie30/ghorg/configs" "github.com/spf13/cobra" "github.com/spf13/viper" + + "github.com/gabrie30/ghorg/colorlog" + "github.com/gabrie30/ghorg/configs" ) var ( @@ -265,7 +266,7 @@ func init() { _ = viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config")) cloneCmd.Flags().StringVar(&protocol, "protocol", "", "GHORG_CLONE_PROTOCOL - Protocol to clone with, ssh or https, (default https)") - cloneCmd.Flags().StringVarP(&path, "path", "p", "", "GHORG_ABSOLUTE_PATH_TO_CLONE_TO - Absolute path the ghorg_* directory will be created. Must end with / (default $HOME/Desktop/ghorg)") + cloneCmd.Flags().StringVarP(&path, "path", "p", "", "GHORG_ABSOLUTE_PATH_TO_CLONE_TO - Absolute path to the home for ghorg clones. Must start with / (default $HOME/ghorg)") cloneCmd.Flags().StringVarP(&branch, "branch", "b", "", "GHORG_BRANCH - Branch left checked out for each repo cloned (default master)") cloneCmd.Flags().StringVarP(&token, "token", "t", "", "GHORG_GITHUB_TOKEN/GHORG_GITLAB_TOKEN/GHORG_GITEA_TOKEN/GHORG_BITBUCKET_APP_PASSWORD/GHORG_BITBUCKET_OAUTH_TOKEN - scm token to clone with") cloneCmd.Flags().StringVarP(&bitbucketUsername, "bitbucket-username", "", "", "GHORG_BITBUCKET_USERNAME - Bitbucket only: username associated with the app password") diff --git a/scripts/local-gitlab/integration-tests.sh b/scripts/local-gitlab/integration-tests.sh index 2cf9401..d03bcd9 100755 --- a/scripts/local-gitlab/integration-tests.sh +++ b/scripts/local-gitlab/integration-tests.sh @@ -4,7 +4,7 @@ set -ex TOKEN=${1:-'password'} GITLAB_URL=${2:-'http://gitlab.example.com'} -LOCAL_GITLAB_GHORG_DIR=${3:-"${HOME}/Desktop/ghorg"} +LOCAL_GITLAB_GHORG_DIR=${3:-"${HOME}/ghorg"} export GHORG_INSECURE_GITLAB_CLIENT=true diff --git a/scripts/local-gitlab/start-ee.sh b/scripts/local-gitlab/start-ee.sh index 2c4aec9..beb1148 100755 --- a/scripts/local-gitlab/start-ee.sh +++ b/scripts/local-gitlab/start-ee.sh @@ -5,10 +5,10 @@ set -e STOP_GITLAB_WHEN_FINISHED=${1:-'true'} PERSIST_GITLAB_LOCALLY=${2:-'false'} GITLAB_IMAGE_TAG=${3:-'latest'} -GITLAB_HOME=${4:-"$HOME/Desktop/ghorg/local-gitlab-ee-data-${GITLAB_IMAGE_TAG}"} +GITLAB_HOME=${4:-"$HOME/ghorg/local-gitlab-ee-data-${GITLAB_IMAGE_TAG}"} GITLAB_HOST=${5:-'gitlab.example.com'} GITLAB_URL=${6:-'http://gitlab.example.com'} -LOCAL_GITLAB_GHORG_DIR=${7:-"${HOME}/Desktop/ghorg"} +LOCAL_GITLAB_GHORG_DIR=${7:-"${HOME}/ghorg"} if [ "${ENV}" == "ci" ];then echo "127.0.0.1 gitlab.example.com" >> /etc/hosts @@ -16,7 +16,7 @@ fi docker rm gitlab --force --volumes -rm -rf $HOME/Desktop/ghorg/local-gitlab-* +rm -rf $HOME/ghorg/local-gitlab-* echo "" echo "To follow gitlab container logs use the following command in a new window"