From 2dd9d8a055b04214da80ae939716e501e6dfd210 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 3 Aug 2016 10:16:25 +0200
Subject: [PATCH 1/3] Correct some syntax errors in the ubuntu-core snap hooks

---
 live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary | 1 -
 live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary b/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
index 94e88a1f..b3b0404e 100644
--- a/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
+++ b/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
@@ -9,7 +9,6 @@ PREFIX=binary/boot/filesystem.dir
 mkdir -p $PREFIX/usr/local/bin
 cat >$PREFIX/usr/local/bin/no-apt <<EOF
 #!/bin/sh
-cat <<EOF
 Ubuntu Core does not use apt-get, see 'snappy --help'!
 EOF
 chmod 755 $PREFIX/usr/local/bin/no-apt
diff --git a/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary b/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
index f6b480fe..3ad532c8 100755
--- a/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
+++ b/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
@@ -9,7 +9,6 @@ PREFIX=binary/boot/filesystem.dir
 mkdir -p $PREFIX/usr/local/bin
 cat >$PREFIX/usr/local/bin/xdg-open <<EOF
 #!/bin/sh
-cat <<'EOF'
 dbus-send --print-reply --session --dest=com.canonical.SafeLauncher / com.canonical.SafeLauncher.OpenURL string:"$1"
 EOF
 chmod 755 $PREFIX/usr/local/bin/xdg-open

From 377b075dcc308fb927c26f8fd4c8bebff68aa9c0 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 3 Aug 2016 10:17:24 +0200
Subject: [PATCH 2/3] escape $1 variable in the xdg script where needed

---
 live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary b/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
index 3ad532c8..3c2885b2 100755
--- a/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
+++ b/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
@@ -9,7 +9,7 @@ PREFIX=binary/boot/filesystem.dir
 mkdir -p $PREFIX/usr/local/bin
 cat >$PREFIX/usr/local/bin/xdg-open <<EOF
 #!/bin/sh
-dbus-send --print-reply --session --dest=com.canonical.SafeLauncher / com.canonical.SafeLauncher.OpenURL string:"$1"
+dbus-send --print-reply --session --dest=com.canonical.SafeLauncher / com.canonical.SafeLauncher.OpenURL string:"\$1"
 EOF
 chmod 755 $PREFIX/usr/local/bin/xdg-open
 

From da28a130be24b7c9420e2d4cbc063981989061b8 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 3 Aug 2016 10:17:59 +0200
Subject: [PATCH 3/3] update hook comment to match the content

---
 live-build/ubuntu-core/hooks/700-classic-dir.binary | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/live-build/ubuntu-core/hooks/700-classic-dir.binary b/live-build/ubuntu-core/hooks/700-classic-dir.binary
index 3f8cadbe..334def66 100755
--- a/live-build/ubuntu-core/hooks/700-classic-dir.binary
+++ b/live-build/ubuntu-core/hooks/700-classic-dir.binary
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# removing debian packaging artifacts
+# create hostfs entry
 
 set -ex