Merge lp:~mterry/unity8-desktop-session/snap-install-idempotent into lp:unity8-desktop-session

[Michael Terry]

Let unity8-snap-install handle already-installed versions of snaps. And make it install several core app snaps.

Let unity8-snap-install handle already-installed versions of snaps. And make it install several core app snaps.

[lp:~mterry/unity8-desktop-session/snap-install-idempotent]

114. By Michael Terry on 2016-11-22

Merely return instead of exit if the user doesn't want to replace a snap

115. By Michael Terry on 2016-11-22

use sh not bash

116. By Michael Terry on 2016-11-22

exit cleanly

117. By Michael Terry on 2016-11-22

Add filemanager and terminal

118. By Michael Terry on 2016-11-22

Add more apps

119. By Michael Terry on 2016-11-22

Drop webbrowser-app (we'll use built-in firefox for now; fix comments

[Stephen M. Webb (bregma)]

I'm OK with this.

review: Approve

=== modified file 'scripts/unity8-snap-install'
--- scripts/unity8-snap-install	2016-10-06 15:31:51 +0000
+++ scripts/unity8-snap-install	2016-11-22 20:57:05 +0000
@@ -1,7 +1,53 @@
 #!/bin/sh
+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
 
-if [ -f ~/.snap/auth.json ] ; then
-	snap install --devmode --channel=edge unity8-session
-else
-	sudo snap install --devmode --channel=edge unity8-session
+sudo=
+if ! [ -f ~/.snap/auth.json ]; then
+    sudo=sudo
 fi
+
+echo_cmd() {
+    tput bold
+    echo "$@"
+    tput sgr0
+    $@
+}
+
+install_snap() {
+    rev=$(snap list $1 2>/dev/null | grep "^$1 " | tr -s ' ' | cut -d' ' -f3)
+
+    # No version installed yet
+    if [ -z "$rev" ]; then
+        echo_cmd $sudo snap install $@
+
+    # Local version installed
+    elif expr + "$rev" : 'x.*' >/dev/null; then
+        while true; do
+            read -p "Remove local snap of $1 in favor of store version? [Yn] " yn
+            case ${yn:-y} in
+                [Yy]* ) echo_cmd $sudo snap remove $1
+                        echo_cmd $sudo snap install $@
+                        break;;
+                [Nn]* ) return;;
+                * ) echo "Please answer yes or no.";;
+            esac
+        done
+
+    # Store version installed
+    else
+        # This refresh will usually fail due to no new version, but that's fine.
+        echo_cmd $sudo snap refresh $@
+    fi
+}
+
+install_snap unity8-session --edge --devmode
+install_snap address-book-app --edge --devmode
+install_snap camera-app --edge --devmode
+install_snap gallery-app --edge --devmode
+install_snap ubuntu-calculator-app --edge
+install_snap ubuntu-calendar-app --edge --devmode
+install_snap ubuntu-clock-app --edge # has stable channel version
+install_snap ubuntu-filemanager-app --edge --devmode
+install_snap ubuntu-terminal-app --edge --devmode
+
+exit 0