Merge lp:~townsend/libertine/copy-user-data into lp:libertine

[Christopher Townsend]

Instead of just creating the user-data dir, we should actually copy the contents of the click package's user-data in case there are things in it we need.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:159
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/88/
Executed test runs:
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/985/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/88/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

OK

review: Approve

=== modified file 'data/puritine-click.conf'
--- data/puritine-click.conf	2015-12-08 21:27:10 +0000
+++ data/puritine-click.conf	2016-01-19 17:01:09 +0000
@@ -20,9 +20,9 @@
 		ln -s $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json
 	fi
 
-	# Create the user-data dir
+	# Create and copy the user-data dir from the click package
 	if [ ! -d $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME ] ; then
-		mkdir -p $HOME/.local/share/libertine-container/user-data/$CONTAINER_NAME/
+		cp -dR $PACKAGE_PATH/libertine-config/libertine-container/ $HOME/.local/share/libertine-container/
 	fi
 else
 	rm -rf $HOME/.cache/libertine-container/$CONTAINER_NAME