apt-zephyr: Make pre_install_pkgs a function.

[Scripts/git/.git] / apt-zephyr / apt-zephyr

diff --git a/apt-zephyr/apt-zephyr b/apt-zephyr/apt-zephyr
index 3650cc572b915c7d8e22de267e626024245e249a..7db23c592381a3885c9c1258d8412ef1a1b8c0a4 100755 (executable)
--- a/apt-zephyr/apt-zephyr
+++ b/apt-zephyr/apt-zephyr
@@ -69,27 +69,37 @@ parse_v1 ()
     rm -f "$oldpkgs" "$newpkgs"
 }
 
-read -r line
-case "$line" in
-    'VERSION 2')
-       while read -r line && [ -n "$line" ]; do :; done
-       while read -r package oldver cmp newver action; do
-           case "$action" in
-               '**CONFIGURE**' | '**REMOVE**')
-                   package "$package" "$oldver" "$cmp" "$newver"
-                   ;;
-               '**ERROR**')
-                   echo "ERROR on $package $newver"
-                   ;;
-           esac
-       done
-       ;;
-    'VERSION *')
-       echo "$0: unrecognized version: $line"
-       ;;
-    '')
-       ;;
-    *)
-       (echo "$line"; cat) | parse_v1
-       ;;
-esac | send_zephyr
+parse_v2 ()
+{
+    while read -r line && [ -n "$line" ]; do :; done
+    while read -r package oldver cmp newver action; do
+       case "$action" in
+           '**CONFIGURE**' | '**REMOVE**')
+               package "$package" "$oldver" "$cmp" "$newver"
+               ;;
+           '**ERROR**')
+               echo "ERROR on $package $newver"
+               ;;
+       esac
+    done
+}
+
+pre_install_pkgs ()
+{
+    read -r line
+    case "$line" in
+       'VERSION 2')
+           parse_v2 | send_zephyr
+           ;;
+       'VERSION *')
+           echo "$0: unrecognized version: $line" | send-zephyr
+           ;;
+       '')
+           ;;
+       *)
+           (echo "$line"; cat) | parse_v1 | send_zephyr
+           ;;
+    esac
+}
+
+pre_install_pkgs