Merge pull request #1 from var-bin/fix-scripts

Fix scripts

Author: var-bin

README.md

@@ -14,17 +14,17 @@ $ git clone https://github.com/var-bin/terminalForCoder__WSD.git
 ## The list of topics
 
 1. Terminal managers
-    1. `screen`
+    1. `screen` [[Follow this link]](https://github.com/var-bin/terminalForCoder__WSD/tree/master/screen)
         * Installation
         * Configuration file for `screen`
         * Basic key combinations
         * How it works
-    2. `tmux`
+    2. `tmux` [[Follow this link]](https://github.com/var-bin/terminalForCoder__WSD/tree/master/tmux)
         * Installation
         * Basic key combinations
         * How it works
-    3. `screen` vs `tmux`
-2. `bash`
+    3. `screen` vs `tmux` [[Follow this link]](https://github.com/var-bin/terminalForCoder__WSD/tree/master/screen-vs-tmux)
+2. `bash` [[Follow this link]](https://github.com/var-bin/terminalForCoder__WSD/tree/master/bash)
     1. Basic
         * Variables
         * Passing arguments to the script
@@ -37,7 +37,7 @@ $ git clone https://github.com/var-bin/terminalForCoder__WSD.git
     3. Loops for repeated code
         * `for/in`
         * `while`
-3. Routine tasks automation
+3. Routine tasks automation [[Follow this link]](https://github.com/var-bin/terminalForCoder__WSD/tree/master/bash/scripting)
     * Fast `diff`
     * Fast `diff` + `Jira API`
     * Clean _dist

bash/README.md

@@ -28,7 +28,7 @@ The beginning of any script in bash
 **Read variable:**
 
 ```bash
-  "$path" или "${path}"
+  "$path" or "${path}"
 ```
 
 **Pass arguments to a script:**
@@ -153,7 +153,7 @@ The beginning of any script in bash
     echo "Removing dir"
     rm -r "$1"
   else
-    echo "Can't remove ${1}"
+    echo "Cannot remove ${1}"
   fi
 ```
 
@@ -242,33 +242,44 @@ The beginning of any script in bash
 ```bash
   #!/bin/bash
 
+  PATH_TO_DIFF_DIR="${HOME}/diff/"
+  FILE_EXTENTION=".diff"
+
+  USER_NAME="<user_name>"
+  USER_PASSWORD="<user_password>"
+  PROJECT_NAME="<project_name>"
+
+  # if "$1" is empty
   if [ -z "$1" ]
   then
     echo "Please, specify an issue ID"
-    exit 1
+    exit 0
   fi
 
   issue_id="$1"
   branch=$(git rev-parse --abbrev-ref HEAD)
 
   # Get the first line of git remote output and cut a path to repository
   repository=$(git remote -v | head -n1 | sed "s/^origin.*\/\(.*\)\.git\s(.*)/\1/")
+  file_name="${branch}-${repository}${FILE_EXTENTION}"
 
-  path_to_diff="${HOME}/<path_to_diff_directory>${branch}-${repository}.diff"
+  # path to diff directory with <filename>.diff
+  path_to_diff="${PATH_TO_DIFF_DIR}${file_name}"
 
-  diff_live () {
-    git diff "origin/live..master/${branch}" > "$path_to_diff"
+  diffMaster() {
+    git diff "origin/master origin/${branch}" > "$path_to_diff"
   }
 
-  attach_diff () {
-    curl -D- -u "<ipa_username>":"<ipa_password>" -X POST -H "X-Atlassian-Token: no-check" -F "file=@${path_to_diff};type=text/x-diff" "https://jira.<project_name>.com/rest/api/2/issue/${issue_id}/attachments"
+  attachDiff() {
+    curl -D -u "${USER_NAME}":"${USER_PASSWORD}" -X POST -H "X-Atlassian-Token: no-check" -F "file=@${path_to_diff};type=text/x-diff" "https://jira.${PROJECT_NAME}.com/rest/api/2/issue/${issue_id}/attachments"
   }
 
-  diff_live && attach_diff
+  diffMaster && attachDiff
 
-  # Usage: cd <repo_name> && attach_diff <issue_id>
+  # Usage: cd <repo_name> && fast_diff_v2.sh <issue_id>
   # <issue_id> should include your company prefix (ABC, XYZ, XX, etc.)
-  # At instance, "attach_diff XYZ-135" will try to attach diff to https://jira.<project_name>.com/browse/XYZ-135
+  # At instance, "./fast_diff_v2.sh XYZ-135" will try to attach diff to
+  # https://jira.<project_name>.com/browse/XYZ-135
 ```
 
 #### Up a large number of repositories
@@ -287,41 +298,56 @@ The beginning of any script in bash
   # get list of repositories
   findRepo() {
     REPO_NAME="terminalForCoder__WSD"
-    path_to_vendor_repo="${HOME}/${REPO_NAME}/bash/core/vendors/"
-    # find all git repositories in $path_to_vendor_repo
+    PATH_TO_VENDORS_REPO="${HOME}/${REPO_NAME}/bash/core/vendors/"
+
+    # find all git repositories in $PATH_TO_VENDORS_REPO
     # filter by /.git
-    r=$(find ${path_to_vendor_repo} -name .git | xargs | sed "s/\\/.git//g")
+
+    if [[ -e "$PATH_TO_VENDORS_REPO" ]]
+    then
+      r=$( find "$PATH_TO_VENDORS_REPO" -name .git | xargs | sed "s/\\/.git//g" )
+    else
+      echo "Cannot find ${PATH_TO_VENDORS_REPO}"
+      echo "Try to edit REPO_NAME in ${0}"
+      exit 0
+    fi
+
     # do check repositories stuff
-    checkBranch "$r"
+    checkBranch $r
   }
 
   # do check repositories stuff
   checkBranch() {
     BRANCH="master"
+    CHECK_BRANCH="* master"
 
-    # $i is item in $r
+    # $i is an item in $r
     for i in "$@"
     do
       # get current branch name
-      b=`cd ${i} && git branch | grep \*`
+      b=$(cd "$i" && git branch | grep \*)
       echo "repo: ${i}"
       echo "current brunch: ${b}"
 
       # check branch
-      if [[ "$b" != "* master" ]]
+      if [[ "$b" != "$CHECK_BRANCH" ]]
       then
         echo "!Error! ${i} is not on ${BRANCH} branch"
         echo "Current branch is ${b}"
+        echo "Checkout to ${BRANCH} and do git pull stuff for ${i}"
         cd "$i" && git checkout "$BRANCH" && git branch && git pull origin "$BRANCH"
+        echo ""
       else
-        echo "Do pull stuff"
+        echo "Do git pull stuff for ${i}"
         cd "$i" && git branch && git pull origin "$BRANCH"
+        echo ""
       fi
     done
     echo "Done. Congratulation, you win!"
   }
 
   findRepo "$@"
+
 ```
 
 #### Helpful aliases

bash/clone_vendors.sh

@@ -2,6 +2,7 @@
 # clone vendors repositories to ./core/vendors
 REPO_NAME="terminalForCoder__WSD"
 PATH_TO_CORE="${HOME}/${REPO_NAME}/bash/core"
+PATH_TO_VENDORS_REPO="${HOME}/${REPO_NAME}/vendors"
 
 # array with repositories
 repositories=( "https://github.com/larscmagnusson/CSS3MultiColumn.git" "https://github.com/tc39/test262.git" "https://github.com/postcss/postcss" "https://github.com/webpack/webpack" "https://github.com/var-bin/spriteFactory.git" "https://github.com/var-bin/backbone-training.git" "https://github.com/var-bin/flex-grid-framework.git" "https://github.com/var-bin/BrandButtons.git" "https://github.com/var-bin/less-easings.git" )
@@ -10,11 +11,20 @@ i=0 # start el
 repositories_count=${#repositories[@]} # array size
 
 cloneVendors() {
-  # if "${PATH_TO_CORE}/vendors" is not exist
-  # create "${PATH_TO_CORE}/vendors" directory
-  if [[ ! -e "${PATH_TO_CORE}/vendors" ]]
+  # if "${PATH_TO_CORE}" is not exist
+  # show info message
+  if [[ ! -e "${PATH_TO_CORE}" ]]
   then
-    mkdir "${PATH_TO_CORE}/vendors"
+    echo "Cannot find ${PATH_TO_CORE}"
+    echo "Try to edit REPO_NAME in ${0}"
+    exit 0
+  fi
+
+  # if "${PATH_TO_VENDORS_REPO}" is not exist
+  # create "${PATH_TO_VENDORS_REPO}" directory
+  if [[ ! -e "${PATH_TO_VENDORS_REPO}" ]]
+  then
+    mkdir "${PATH_TO_VENDORS_REPO}"
   fi
 
   while [ "$i" -lt "$repositories_count" ]
@@ -23,27 +33,28 @@ cloneVendors() {
     vendor=$(echo ${repositories[$i]} | sed "s/https\:\/\/github\.com\/*//g" | sed "s/\/.*//g")
     vendor_repo_name=$(echo ${repositories[$i]} | sed "s/https\:\/\/github\.com\/.*\///g" | sed "s/\.git//g")
 
-    # if "${PATH_TO_CORE}/vendors/${vendor}" is directory
+    # if "${PATH_TO_VENDORS_REPO}/${vendor}" is directory
     # go to directory and do git clone stuff
-    if [[ -d "${PATH_TO_CORE}/vendors/${vendor}" ]]
+    if [[ -d "${PATH_TO_VENDORS_REPO}/${vendor}" ]]
     then
-      echo "Directory ${PATH_TO_CORE}/vendors/${vendor} is exist"
+      echo "Directory ${PATH_TO_VENDORS_REPO}/${vendor} is exist"
 
-      if [[ ! -e "${PATH_TO_CORE}/vendors/${vendor}/${vendor_repo_name}" ]]
+      if [[ ! -e "${PATH_TO_VENDORS_REPO}/${vendor}/${vendor_repo_name}" ]]
       then
-        cd "${PATH_TO_CORE}/vendors/${vendor}" && git clone ${repositories[$i]}
+        echo "Repository: ${repositories[$i]} is clonning"
+        cd "${PATH_TO_VENDORS_REPO}/${vendor}" && git clone ${repositories[$i]}
       else
-        echo "Repository ${PATH_TO_CORE}/vendors/${vendor}/${vendor_repo_name} is exist"
+        echo "Repository ${PATH_TO_VENDORS_REPO}/${vendor}/${vendor_repo_name} is exist"
         echo ""
       fi
     else
-    # create directory "${PATH_TO_CORE}/vendors/${vendor}"
+    # create directory "${PATH_TO_VENDORS_REPO}/${vendor}"
     # go to directory and do git clone stuff
-      echo "Create directory: ${PATH_TO_CORE}/vendors/${vendor}"
-      echo "Repository: ${repositories[$i]} is clonning"
+      echo "Create directory: ${PATH_TO_VENDORS_REPO}/${vendor}"
+      mkdir "${PATH_TO_VENDORS_REPO}/${vendor}"
 
-      mkdir "${PATH_TO_CORE}/vendors/${vendor}"
-      cd "${PATH_TO_CORE}/vendors/${vendor}" && git clone ${repositories[$i]}
+      echo "Repository: ${repositories[$i]} is clonning"
+      cd "${PATH_TO_VENDORS_REPO}/${vendor}" && git clone ${repositories[$i]}
     fi
     i=$((i + 1)) # i++
   done

bash/scripting/clean_dist.sh

@@ -9,13 +9,22 @@ cleanDist() {
   theme="$1"
   DIST_NAME="_dist"
   REPO_NAME="terminalForCoder__WSD"
+  PATH_TO_CORE="${HOME}/${REPO_NAME}/bash/core"
 
-  PATH_TO_ASSETS="${HOME}/${REPO_NAME}/bash/core/assets"
+  PATH_TO_ASSETS="${PATH_TO_CORE}/assets"
+
+  # if "${PATH_TO_CORE}" is not exist
+  # show info message
+  if [[ ! -e "${PATH_TO_CORE}" ]]
+  then
+    echo "Cannot find ${PATH_TO_CORE}"
+    echo "Try to edit REPO_NAME in ${0}"
+    exit 0
+  fi
 
   # if $1 == "" clean all _dist in each theme
   if [[ -z "$theme" ]]
   then
-    theme="assets"
     path_to_dist="$PATH_TO_ASSETS"
   else
     path_to_dist="${PATH_TO_ASSETS}/${theme}"
@@ -24,10 +33,10 @@ cleanDist() {
   if [[ -n $(find "$path_to_dist" -type d -name "$DIST_NAME") ]]
   then
     # do clean stuff
-    find "$path_to_dist" -type d -name "$DIST_NAME" | xargs -l rm -rfv
-    echo "Dist of ${theme} have already deleted: ${path_to_dist}"
+    find "$path_to_dist" -type d -name "$DIST_NAME" | xargs rm -rfv
+    echo "Dist of ${theme} has already deleted: ${path_to_dist}"
   else
-    echo "Can not find ${DIST_NAME} in ${theme}"
+    echo "Cannot find ${DIST_NAME} in ${theme}"
   fi
 }
 

bash/scripting/fast_diff.sh

@@ -13,6 +13,7 @@ branch="$1"
 if [[ -z "$branch" ]]
 then
   echo "Enter the branch name"
+  exit 0
 else
   path="${PATH_TO_DIFF_DIR}${FILE_PREFIX}${branch}${FILE_EXTENTION}"
   git diff origin/master origin/"$branch" > "$path"

bash/scripting/fast_diff_v2.sh

@@ -3,8 +3,8 @@
 PATH_TO_DIFF_DIR="${HOME}/diff/"
 FILE_EXTENTION=".diff"
 
-USER_NAME="<ipa_user_name>"
-USER_PASSWORD="<ipa_user_password>"
+USER_NAME="<user_name>"
+USER_PASSWORD="<user_password>"
 PROJECT_NAME="<project_name>"
 
 # if "$1" is empty
@@ -24,16 +24,17 @@ file_name="${branch}-${repository}${FILE_EXTENTION}"
 # path to diff directory with <filename>.diff
 path_to_diff="${PATH_TO_DIFF_DIR}${file_name}"
 
-diff_master() {
+diffMaster() {
   git diff "origin/master origin/${branch}" > "$path_to_diff"
 }
 
-attach_diff() {
+attachDiff() {
   curl -D -u "${USER_NAME}":"${USER_PASSWORD}" -X POST -H "X-Atlassian-Token: no-check" -F "file=@${path_to_diff};type=text/x-diff" "https://jira.${PROJECT_NAME}.com/rest/api/2/issue/${issue_id}/attachments"
 }
 
-diff_master && attach_diff
+diffMaster && attachDiff
 
 # Usage: cd <repo_name> && fast_diff_v2.sh <issue_id>
 # <issue_id> should include your company prefix (ABC, XYZ, XX, etc.)
-# At instance, "./fast_diff_v2.sh XYZ-135" will try to attach diff to https://jira.<project_name>.com/browse/XYZ-135
+# At instance, "./fast_diff_v2.sh XYZ-135" will try to attach diff to
+# https://jira.<project_name>.com/browse/XYZ-135

bash/scripting/up_repo.sh

@@ -9,17 +9,17 @@
 # get list of repositories
 findRepo() {
   REPO_NAME="terminalForCoder__WSD"
-  PATH_TO_VENDOR_REPO="${HOME}/${REPO_NAME}/bash/core/vendors/"
+  PATH_TO_VENDORS_REPO="${HOME}/${REPO_NAME}/bash/core/vendors/"
 
-  # find all git repositories in $PATH_TO_VENDOR_REPO
+  # find all git repositories in $PATH_TO_VENDORS_REPO
   # filter by /.git
 
-  if [[ -e "$PATH_TO_VENDOR_REPO" ]]
+  if [[ -e "$PATH_TO_VENDORS_REPO" ]]
   then
-    r=$( find "$PATH_TO_VENDOR_REPO" -name .git | xargs | sed "s/\\/.git//g" )
+    r=$( find "$PATH_TO_VENDORS_REPO" -name .git | xargs | sed "s/\\/.git//g" )
   else
-    echo "Can not find ${PATH_TO_VENDOR_REPO}"
-    echo "Try to edit REPO_NAME"
+    echo "Cannot find ${PATH_TO_VENDORS_REPO}"
+    echo "Try to edit REPO_NAME in ${0}"
     exit 0
   fi
 
@@ -30,6 +30,7 @@ findRepo() {
 # do check repositories stuff
 checkBranch() {
   BRANCH="master"
+  CHECK_BRANCH="* master"
 
   # $i is an item in $r
   for i in "$@"
@@ -40,13 +41,15 @@ checkBranch() {
     echo "current brunch: ${b}"
 
     # check branch
-    if [[ "$b" != "* master" ]]
+    if [[ "$b" != "$CHECK_BRANCH" ]]
     then
       echo "!Error! ${i} is not on ${BRANCH} branch"
       echo "Current branch is ${b}"
+      echo "Checkout to ${BRANCH} and do git pull stuff for ${i}"
       cd "$i" && git checkout "$BRANCH" && git branch && git pull origin "$BRANCH"
+      echo ""
     else
-      echo "Do pull stuff"
+      echo "Do git pull stuff for ${i}"
       cd "$i" && git branch && git pull origin "$BRANCH"
       echo ""
     fi