Merge lp:~verterok/ols-jenkaas/snap-sideload-classic-snaps into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Guillermo Gonzalez]

Use 2 lists for classic and regular snaps in scripts/snap-sideload.sh

[Daniel Manrique (roadmr)]

Good solution, thanks!

review: Approve

=== modified file 'scripts/snap-sideload.sh'
--- scripts/snap-sideload.sh	2020-04-29 20:18:38 +0000
+++ scripts/snap-sideload.sh	2020-04-30 11:48:22 +0000
@@ -21,18 +21,27 @@
 
 SWIFT_URL="{sideload.snaps.url}"
 SNAPS_TO_INSTALL="{sideload.snaps}"
-for snap_file in $SNAPS_TO_INSTALL
-do
+CLASSIC_SNAPS_TO_INSTALL="{sideload.classic_snaps}"
+
+fetch_snap () {
+    snap_file=$1
     echo "Downloading $snap_file (assert and snap)"
     curl -s -o $TMP_DIR/$snap_file.assert $SWIFT_URL/$snap_file.assert
     curl -s -o $TMP_DIR/$snap_file.snap $SWIFT_URL/$snap_file.snap
+}
+install_snap () {
+    snap_file=$1
+    classic=$2
     sudo snap ack $TMP_DIR/$snap_file.assert
-    # FIXME: find a nice way to mark which snaps require classic instead of 
-    # hardoding the check here
-    case $snap_file in
-      "charm"* | "codetree"*)
-          sudo snap install $TMP_DIR/$snap_file.snap --classic ;;
-      *)
-          sudo snap install $TMP_DIR/$snap_file.snap ;;
-    esac
+    sudo snap install $TMP_DIR/$snap_file.snap $classic
+}
+for snap_file in $SNAPS_TO_INSTALL
+do
+    fetch_snap $snap_file
+    install_snap $snap_file ""
+done
+for snap_file in $CLASSIC_SNAPS_TO_INSTALL
+do
+    fetch_snap $snap_file
+    install_snap $snap_file "--classic"
 done