From c1fa5df9d73a39852a869c149334fce1549010fd Mon Sep 17 00:00:00 2001 From: Muhammad Zahalqa Date: Wed, 13 May 2020 14:12:16 +0300 Subject: [PATCH 01/17] Refactored logic to get class name --- gitclass | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gitclass b/gitclass index 6e871fe..2c37017 100755 --- a/gitclass +++ b/gitclass @@ -106,11 +106,11 @@ while getopts ":hpc:vk::r:b:dit:" opt; do display "\t -p \t\t pull, this is the default\n" display "\t -c \t clone optionaly with depth\n" display "\t -r \t clone repo named repo\n" - # display "\t -i Imemdiate, wait between action on repos\n" - display "\t -k \t\t class/course name. user will be class.user\n" - display "\t -d \t\t Remove local repository\n" - display "\t -t n \t\t Wait n seconds between actions on repos\n" - display "\t -v \t\t Verbose mode\n" + # display "\t -i \t immediate, no wait between actions on repos\n" + display "\t -k \t class/course name. user will be class.user\n" + display "\t -d \t\t remove local repository\n" + display "\t -t n \t\t wait n seconds between actions on repos\n" + display "\t -v \t\t verbose mode\n" display "\t -h \t\t help message\n" exit 0 ;; @@ -160,24 +160,25 @@ while [ "$1" != "" ]; do shift done -students_file=$( Date: Wed, 13 May 2020 14:16:25 +0300 Subject: [PATCH 02/17] bug fix --- gitclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitclass b/gitclass index 2c37017..1b48f20 100755 --- a/gitclass +++ b/gitclass @@ -125,7 +125,7 @@ while getopts ":hpc:vk::r:b:dit:" opt; do ;; k) klass_arg=1 if [ $OPTARG != "" ]; then - klass=$OPTARG + class_prefix="${OPTARG}." fi ;; r) if [ $OPTARG != "" ]; then From 129536cd8a0b2365246b105f5906093a67e63078 Mon Sep 17 00:00:00 2001 From: Muhammad Zahalqa Date: Wed, 13 May 2020 14:18:14 +0300 Subject: [PATCH 03/17] minor fix --- gitclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitclass b/gitclass index 1b48f20..eb18fe6 100755 --- a/gitclass +++ b/gitclass @@ -162,7 +162,7 @@ done student_count_delta=0 if [[ "$klass_arg" == "1" ]]; then - class=klass + class="$class_prefix" elif [ -e class ]; then # or read class name from file class=$( Date: Wed, 13 May 2020 14:20:27 +0300 Subject: [PATCH 04/17] refactor class name and student names retrieval --- gitclass | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gitclass b/gitclass index eb18fe6..13fa175 100755 --- a/gitclass +++ b/gitclass @@ -161,27 +161,27 @@ while [ "$1" != "" ]; do done student_count_delta=0 -if [[ "$klass_arg" == "1" ]]; then - class="$class_prefix" -elif [ -e class ]; then - # or read class name from file - class=$( Date: Wed, 13 May 2020 14:22:37 +0300 Subject: [PATCH 05/17] refactored student names loading from file --- gitclass | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/gitclass b/gitclass index 13fa175..1567db1 100755 --- a/gitclass +++ b/gitclass @@ -88,6 +88,19 @@ ClearLine(){ echo -en "\e[2K" } +load_students(){ + students_file=$( Date: Wed, 13 May 2020 14:22:57 +0300 Subject: [PATCH 06/17] remove unsued var --- gitclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitclass b/gitclass index 1567db1..4895a69 100755 --- a/gitclass +++ b/gitclass @@ -108,7 +108,7 @@ ellapsed=5 repo=${COURSE_GIT_REPO:-'work'} branch='master' verbose=0 -klass='' +class_prefix='' while getopts ":hpc:vk::r:b:dit:" opt; do case ${opt} in From 80d72aff1c690dd8121ad136749c5e74f167d53b Mon Sep 17 00:00:00 2001 From: Muhammad Zahalqa Date: Wed, 13 May 2020 14:26:39 +0300 Subject: [PATCH 07/17] make class name from command line arg overridesanything --- gitclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitclass b/gitclass index 4895a69..18e638c 100755 --- a/gitclass +++ b/gitclass @@ -95,7 +95,7 @@ load_students(){ # look for first line in students file if its a class alias class="${student_array[0]/class:/}" class=$(trim $class) - class_prefix="${class}." + class_prefix_from_file="${class}." student_array[0]='' student_count_delta=-1 fi @@ -194,6 +194,9 @@ if [[ ! -z "${students// }" ]]; then else if [ -z "${student_array}" ]; then load_students + if [ -z "${class_prefix}" ]; then + class_prefix=$(class_prefix_from_file) + fi fi student_count=${#student_array[@]} student_count=$((student_count+student_count_delta)) From ba3fab187f8e117f5d4ddd281945cce5c463505a Mon Sep 17 00:00:00 2001 From: Muhammad Zahalqa Date: Wed, 13 May 2020 14:41:36 +0300 Subject: [PATCH 08/17] bug fix --- gitclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gitclass b/gitclass index 18e638c..d94db85 100755 --- a/gitclass +++ b/gitclass @@ -88,6 +88,7 @@ ClearLine(){ echo -en "\e[2K" } +class_prefix_from_file='' load_students(){ students_file=$( [-r ]] [-v] [-i | -t