Browse Source

Move functions back in

bryan 4 years ago
parent
commit
6349c21c93
2 changed files with 18 additions and 19 deletions
  1. 0 18
      functions.sh
  2. 18 1
      openwrtBuild

+ 0 - 18
functions.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-extractImage() {
-
-    debug "${FUNCNAME[0]}" "$@"
-
-    local _gz
-
-    [[ $# -lt 1 ]] && echo "extractImage() requires at least one argument" && exit 1
-
-    for _gz in "$@"; do
-        [[ ! -f "$_gz" ]] && return 1
-        debug "gunzip -qfk $_gz"
-        if ! gunzip -qfk "$_gz"; then
-            echo "$_gz extraction failed!"
-        fi
-    done
-}

+ 18 - 1
openwrtBuild

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-source ./functions.sh
 
 #####################
 ##### DEFAULTS ######
@@ -246,6 +245,24 @@ makeImage() {
 }
 
 
+extractImage() {
+
+    debug "${FUNCNAME[0]}" "$@"
+
+    local _gz
+
+    [[ $# -lt 1 ]] && echo "extractImage() requires at least one argument" && exit 1
+
+    for _gz in "$@"; do
+        [[ ! -f "$_gz" ]] && return 1
+        debug "gunzip -qfk $_gz"
+        if ! gunzip -qfk "$_gz"; then
+            echo "$_gz extraction failed!"
+        fi
+    done
+}
+
+
 flashImage() {
 
     debug "${FUNCNAME[0]}"