Merge pull request #8 from Gundars/development

Development

.gitignore

@@ -1 +1,2 @@
 /nbproject/
+/.idea/

README.md

@@ -26,10 +26,22 @@ Syntax: `$ gitmerge [options] [branch]`
 Options:
 - `-p`  generate links to test/master pull requests
 
-###guorigin
-Git update origin - updates git remote origins format from o-auth and SSH to native https in all git repos found in each of specified directories {dir}
+###gitscan
+Scan all directories {dir} for git repositories and perform actions based on options
 
-Syntax: `$ guorigin {dir1} [{dir2} {dir3}...]`
+Syntax: `$ gitscan [options] {dir1} [{dir2} {dir3}...]`
+
+Options:
+- `-o`  update remote origin URLs format from oauth/ssh to https
+- `-m`  list all modified files
+- `-c`  create test and development branches in sync with origin
+
+###buildenv
+Changes {build number} for a {branch} on site environmnet {env}
+
+**Warning:** Before using script, change line 21 - swap dummy string with https link to enriched github repository
+
+Syntax: `$ buildenv {env} {branch} {build number}`
 
 ###gitpress
 Git compress - compresses all commits in current local branch into single commit
@@ -42,9 +54,3 @@ Options:
 
 **Warning:** This will disable history, allign with master to fix pull requests
 
-###buildenv
-Changes {build number} for a {branch} on site environmnet {env}
-
-**Warning:** Before using script, change line 21 - swap dummy string with https link to enriched github repository
-
-Syntax: `$ buildenv {env} {branch} {build number}`

config/global.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+#Global configuration
+declare -A gConf
+gConf[dirStart]=${PWD}
+gConf[dirInstall]=~/.bashscripts
+gConf[dirSymlinks]=/usr/local/bin
+gConf[dirTmp]=/.bashscripts/tmp
+gConf[colN]='\e[00m'
+gConf[colH]='\e[01;36m'
+gConf[colE]='\033[31m'
+gConf[colS]='\e[32m'
+
+declare -A errorMascots
+errorMascots[1]='            __\n           / _)\n    .-^^^-/ /\n __/       /\n<__.|_|-|_|\n'
+errorMascots[2]='''\^~~~~\   )  (   /~~~~^/\n ) *** \  {**}  / *** (\n  ) *** \_ ^^ _/ *** (\n  ) ****   vv   **** (\n   )_****      ****_(\n     )*** m  m ***( \n'''
+errorMascots[3]='''  _____\n /     \ \n| () () |\n \  ^  /\n  |||||\n  |||||\n'''
+errorMascots[4]='''     ,\n    _)\_\n     //}\n    (_;\ \n>>>===> \`==\n    /__/\n     ``\n'''

config/user.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+#User configuration
+declare -A uConf
+uConf[enrichedRepository]=https/link/to/encriched.git