From 4b5adc3f74d76abf5be9e94a2b4a4875e36d89b9 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Thu, 30 Sep 2021 14:42:10 -0700
Subject: [PATCH] bump version to 2

---
 Dockerfile.agnos     |  2 +-
 build_and_package.sh | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.agnos b/Dockerfile.agnos
index 8e9cf42..6b28981 100644
--- a/Dockerfile.agnos
+++ b/Dockerfile.agnos
@@ -201,7 +201,7 @@ RUN /tmptmp/readonly_setup.sh && rm -rf /tmptmp
 COPY ./userspace/files/apt.conf /etc/apt/apt.conf
 
 # Write version file
-RUN echo -n "1.6" > /VERSION
+RUN echo -n "2" > /VERSION
 
 # ################## #
 # #### Cleaunup #### #
diff --git a/build_and_package.sh b/build_and_package.sh
index 6194415..36bf1d8 100755
--- a/build_and_package.sh
+++ b/build_and_package.sh
@@ -2,18 +2,16 @@
 
 read -p "Is the kernel repo up to date? " -n 1 -r
 echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]
-then
-    echo "Update it and run again!"
-    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+  echo "Update it and run again!"
+  [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-read -p "Is the firmware repo up to date? Copied in the new abl if needed?" -n 1 -r
+read -p "Is the firmware repo up to date? Copied in the new abl if needed? " -n 1 -r
 echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]
-then
-    echo "Update it and run again!"
-    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+  echo "Update it and run again!"
+  [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
 ./build_kernel.sh
@@ -21,4 +19,3 @@ cp output/wlan.ko userspace/usr/comma
 cp output/snd*.ko userspace/usr/comma/sound/
 ./build_system.sh
 ./package_ota.sh
-