Update from cron

1 files changed, 17 insertions, 14 deletions

diff --git a/abslibre/blacklist.git/hooks/pre-receive b/abslibre/blacklist.git/hooks/pre-receive
index 6228430..ff70f9c 100755
--- a/abslibre/blacklist.git/hooks/pre-receive
+++ b/abslibre/blacklist.git/hooks/pre-receive
@@ -9,7 +9,7 @@
 ## constants ##
 
 readonly LOG_BLACKLIST_GIT_HOOK=1
-readonly LOG_DIR=/var/log/blacklist
+readonly LOG_DIR=/var/log/blacklist-validate-git-hook
 readonly SHA_REGEX='^([0-9a-f]{40})$'
 
 
@@ -25,19 +25,18 @@ LogFile() # (ref)
 
 LogParseRefData() # (ref_data prev_sha curr_sha ref_file repo ref is_deletion)
 {
-  local ref_data=$1 ; local prev_sha=$2 ; local curr_sha=$3    ; local ref_file=$4 ;
-  local repo=$5     ; local ref=$6      ; local is_deletion=$7 ;
+  local ref_data="$1" ; local prev_sha=$2 ; local curr_sha=$3    ; local ref_file=$4 ;
+  local repo=$5       ; local ref=$6      ; local is_deletion=$7 ;
   local log_file=$(LogFile ${ref})
 
   (( $LOG_BLACKLIST_GIT_HOOK )) && echo "ref_data=${ref_data}"        > ${log_file} && \
-                                   echo "prev=${prev}"               >> ${log_file} && \
-                                   echo "curr=${curr}"               >> ${log_file} && \
+                                   echo "prev=${prev_sha}"           >> ${log_file} && \
+                                   echo "curr=${curr_sha}"           >> ${log_file} && \
                                    echo "ref_file=${ref_file}"       >> ${log_file} && \
                                    echo "ref=${ref}"                 >> ${log_file} && \
                                    echo "is_deletion=${is_deletion}" >> ${log_file}
                                    
 cat $log_file                                   
-echo "repo is blacklist?=$repo"
 }
 
 
@@ -45,24 +44,28 @@ echo "repo is blacklist?=$repo"
 
 ParseRefData() # (prev_sha curr_sha ref_file)
 {
-  local prev=$1
-  local curr=$2
+  local prev_sha=$1
+  local curr_sha=$2
   local ref_file=$3
   local ref=${ref_file##*/}
   local repo=$(basename $(pwd))
   local is_deletion=$(git show-ref "${ref}" > /dev/null && echo 0 || echo 1)
 
-LogParseRefData ${ref_data} ${prev_sha} ${curr_sha} ${ref_file} ${repo} ${ref} ${is_deletion}
+LogParseRefData "${ref_data}" ${prev_sha} ${curr_sha} ${ref_file} ${repo} ${ref} ${is_deletion}
 
   # validate ref data
-  [[ "$#" == '3'               ]] && \
-  [[ "${prev}" =~ ${SHA_REGEX} ]] && \
-  [[ "${curr}" =~ ${SHA_REGEX} ]] && \
-  [[ "${ref}"                  ]] || return
+  [[ "$#" == '3'                   ]] && \
+  [[ "${prev_sha}" =~ ${SHA_REGEX} ]] && \
+  [[ "${curr_sha}" =~ ${SHA_REGEX} ]] && \
+  [[ "${ref}"                      ]] || return
+  
+  local tmp_dir=$(mktemp --directory --tmpdir=/tmp blacklist-validate-git-hook-XXXXXXXXXX)
+echo "ok tmp_dir=$tmp_dir"
 }
 
 
 ## main entry ##
 
-while read ref_data ; do "$(ParseRefData ${ref_data})" || exit 1 ; done ;
+while read ref_data ; do echo "$(ParseRefData ${ref_data})" || exit 1 ; done ;
+#while read ref_data ; do echo "refdata=${ref_data}" || exit 1 ; done ;
 exit 1