mbp15 updates

Author: docker-exec-bot

dbot.sh

@@ -14,15 +14,15 @@ while getopts ":t:o:g:i:" o; do
     case "${o}" in
         g)
             arg_global_op=${OPTARG}
-            $(array_contains "${arg_global_op}" "${global_ops[@]}") || usage
+            array_contains "${arg_global_op}" "${global_ops[@]}" || usage
             ;;
         t)
             arg_target_type=${OPTARG}
-            $(array_contains "${arg_target_type}" "${dir_types[@]}") || usage
+            array_contains "${arg_target_type}" "${dir_types[@]}" || usage
             ;;
         o)
             arg_op=${OPTARG}
-            $(array_contains "${arg_op}" "${ops[@]}") || usage
+            array_contains "${arg_op}" "${ops[@]}" || usage
             ;;
         i)
             arg_image=${OPTARG}
@@ -42,8 +42,6 @@ elif [ ! -z "${arg_global_op}" ] && [ ! -z "${arg_op}" ]; then
     usage
 elif [ ! -z "${arg_op}" ] && [ ! -z "${arg_image}" ]; then
     usage
-elif [ ! -z "${arg_op}" ] && [ ! -z "${arg_target_type}" ]; then
-    usage
 fi
 
 if [ ! -f "${config_file}" ]; then

script/util-web.sh

@@ -1,43 +1,43 @@
-function get_headers() {
-    local url="${1}"
-    local headers=$(curl -sIL "${url}" | grep ':')
-    echo "${headers[@]}"
-}
+#!/bin/bash
 
 function get_header() {
-    local needle="^${1}: (.+)$"; shift
-    local haystack="${@}"
-    grep -Ee "${needle}" <<<"${haystack}" \
-        | sed -Ee "s/${needle}/\1/"
+    local url="${2}"
+    local header="${1}"
+    local header_pattern="^${header}: (.+)$"
+    curl -sIL "${url}" \
+        | sed -E \
+            -e "s/${header_pattern}/\1/" \
+            -e 'tx' -e 'd' -e ':x'
 }
 
 function get_content() {
     local url="${1}"
-    local content=$(curl -sL "${url}")
-    echo "${content}"
+    curl -sL "${url}"
 }
 
 function get_paged_content() {
-    headers=$(get_headers $1)
-    link_header=$(get_header "Link" "${headers[@]}")
+    local url="${1}"
+    local link_pattern="^<(.+)>.*\"(.+)\".*<(.+)>.+$"
 
-    link_pattern="^<(.+)>.*next.*<(.+)>.+$"
+    local link_header
+    local link_next
+    local link_relation
 
-    next=$(sed -Ee "s/${link_pattern}/\1/" <<<"${link_header}")
-    last=$(sed -Ee "s/${link_pattern}/\2/" <<<"${link_header}")
+    link_header=$(get_header "Link" "${url}")
+    link_next=$(sed -Ee "s/${link_pattern}/\1/" <<<"${link_header}")
+    link_relation=$(sed -Ee "s/${link_pattern}/\2/" <<<"${link_header}")
 
-    if [ ! -z "${next}" ] && [ next != last ]; then
-        printf "%s\n%s" "$(get_content $1)" "$(get_paged_content $next)"
+    if [ ! -z "${link_next}" ] && [ "${link_relation}" = "next" ]; then
+        printf "%s\n%s" "$(get_content "${url}")" "$(get_paged_content "${link_next}")"
     else
-        printf "%s" "$(get_content $1)"
+        printf "%s" "$(get_content "${url}")"
     fi
 }
 
 function get_github_repos() {
     local name_pattern='.*"name": "(.+)",'
-    repos=($(get_paged_content https://api.github.com/orgs/docker-exec/repos \
+    get_paged_content https://api.github.com/orgs/docker-exec/repos \
                 | grep '"name"' \
                 | sed -Ee "s/${name_pattern}/\1/" \
-                | sort))
-    echo "${repos[@]}"
+                | sort
 }