Merge lp:~chipaca/snappy/dddddirs into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Move snappy/dirs.go into its own package.

[Sergio Schvezov (sergiusens)]

Might it be better to use 'snappy/dirs' as the package?

review: Approve

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

text conflict in snappy/install_test.go
text conflict in snappy/set_test.go

=== added directory 'dirs'
=== renamed file 'snappy/dirs.go' => 'dirs/dirs.go'
--- snappy/dirs.go	2015-06-30 12:36:00 +0000
+++ dirs/dirs.go	2015-09-29 11:44:13 +0000
@@ -17,58 +17,58 @@
  *
  */
 
-package snappy
+package dirs
 
 import "path/filepath"
 
 // the various file paths
 var (
-	globalRootDir string
-
-	snapAppsDir      string
-	snapOemDir       string
-	snapDataDir      string
-	snapDataHomeGlob string
-	snapAppArmorDir  string
-	snapSeccompDir   string
-	snapUdevRulesDir string
-	localeDir        string
-	snapIconsDir     string
-	snapMetaDir      string
-
-	snapBinariesDir  string
-	snapServicesDir  string
-	snapBusPolicyDir string
-
-	clickSystemHooksDir string
-	cloudMetaDataFile   string
+	GlobalRootDir string
+
+	SnapAppsDir      string
+	SnapOemDir       string
+	SnapDataDir      string
+	SnapDataHomeGlob string
+	SnapAppArmorDir  string
+	SnapSeccompDir   string
+	SnapUdevRulesDir string
+	LocaleDir        string
+	SnapIconsDir     string
+	SnapMetaDir      string
+
+	SnapBinariesDir  string
+	SnapServicesDir  string
+	SnapBusPolicyDir string
+
+	ClickSystemHooksDir string
+	CloudMetaDataFile   string
+
+	SnappyDir = filepath.Join("var", "lib", "snappy")
 )
 
-var snappyDir = filepath.Join("var", "lib", "snappy")
-
 // SetRootDir allows settings a new global root directory, this is useful
 // for e.g. chroot operations
 func SetRootDir(rootdir string) {
-	globalRootDir = rootdir
-
-	snapAppsDir = filepath.Join(rootdir, "/apps")
-	snapOemDir = filepath.Join(rootdir, "/oem")
-	snapDataDir = filepath.Join(rootdir, "/var/lib/apps")
-	snapDataHomeGlob = filepath.Join(rootdir, "/home/*/apps/")
-	snapAppArmorDir = filepath.Join(rootdir, "/var/lib/apparmor/clicks")
-	snapSeccompDir = filepath.Join(rootdir, snappyDir, "seccomp", "profiles")
-	snapIconsDir = filepath.Join(rootdir, snappyDir, "icons")
-	snapMetaDir = filepath.Join(rootdir, snappyDir, "meta")
-
-	snapBinariesDir = filepath.Join(snapAppsDir, "bin")
-	snapServicesDir = filepath.Join(rootdir, "/etc/systemd/system")
-	snapBusPolicyDir = filepath.Join(rootdir, "/etc/dbus-1/system.d")
-
-	clickSystemHooksDir = filepath.Join(rootdir, "/usr/share/click/hooks")
-
-	cloudMetaDataFile = filepath.Join(rootdir, "/var/lib/cloud/seed/nocloud-net/meta-data")
-
-	snapUdevRulesDir = filepath.Join(rootdir, "/etc/udev/rules.d")
-
-	localeDir = filepath.Join(rootdir, "/usr/share/locale")
+	GlobalRootDir = rootdir
+
+	SnapAppsDir = filepath.Join(rootdir, "/apps")
+	SnapOemDir = filepath.Join(rootdir, "/oem")
+	SnapDataDir = filepath.Join(rootdir, "/var/lib/apps")
+	SnapDataHomeGlob = filepath.Join(rootdir, "/home/*/apps/")
+	SnapAppArmorDir = filepath.Join(rootdir, "/var/lib/apparmor/clicks")
+	SnapSeccompDir = filepath.Join(rootdir, SnappyDir, "seccomp", "profiles")
+	SnapIconsDir = filepath.Join(rootdir, SnappyDir, "icons")
+	SnapMetaDir = filepath.Join(rootdir, SnappyDir, "meta")
+
+	SnapBinariesDir = filepath.Join(SnapAppsDir, "bin")
+	SnapServicesDir = filepath.Join(rootdir, "/etc/systemd/system")
+	SnapBusPolicyDir = filepath.Join(rootdir, "/etc/dbus-1/system.d")
+
+	ClickSystemHooksDir = filepath.Join(rootdir, "/usr/share/click/hooks")
+
+	CloudMetaDataFile = filepath.Join(rootdir, "/var/lib/cloud/seed/nocloud-net/meta-data")
+
+	SnapUdevRulesDir = filepath.Join(rootdir, "/etc/udev/rules.d")
+
+	LocaleDir = filepath.Join(rootdir, "/usr/share/locale")
 }
 
=== modified file 'snappy/click.go'
--- snappy/click.go	2015-09-15 14:53:38 +0000
+++ snappy/click.go	2015-09-29 11:44:13 +0000
@@ -42,6 +42,7 @@
 	"time"
 
 	"launchpad.net/snappy/clickdeb"
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/i18n"
 	"launchpad.net/snappy/logger"
@@ -154,7 +155,7 @@
 func systemClickHooks() (hooks map[string]clickHook, err error) {
 	hooks = make(map[string]clickHook)
 
-	hookFiles, err := filepath.Glob(filepath.Join(clickSystemHooksDir, "*.hook"))
+	hookFiles, err := filepath.Glob(filepath.Join(dirs.ClickSystemHooksDir, "*.hook"))
 	if err != nil {
 		return nil, err
 	}
@@ -206,7 +207,7 @@
 				continue
 			}
 
-			dst := filepath.Join(globalRootDir, expandHookPattern(m.qualifiedName(origin), app, m.Version, systemHook.pattern))
+			dst := filepath.Join(dirs.GlobalRootDir, expandHookPattern(m.qualifiedName(origin), app, m.Version, systemHook.pattern))
 
 			if _, err := os.Stat(dst); err == nil {
 				if err := os.Remove(dst); err != nil {
@@ -274,7 +275,7 @@
 		binName = fmt.Sprintf("%s.%s", m.Name, filepath.Base(binary.Name))
 	}
 
-	return filepath.Join(snapBinariesDir, binName)
+	return filepath.Join(dirs.SnapBinariesDir, binName)
 }
 
 func binPathForBinary(pkgPath string, binary Binary) string {
@@ -434,7 +435,7 @@
 		socketFileName = filepath.Base(generateSocketFileName(m, service))
 	}
 
-	return systemd.New(globalRootDir, nil).GenServiceFile(
+	return systemd.New(dirs.GlobalRootDir, nil).GenServiceFile(
 		&systemd.ServiceDescription{
 			AppName:        m.Name,
 			ServiceName:    service.Name,
@@ -462,7 +463,7 @@
 
 	serviceFileName := filepath.Base(generateServiceFileName(m, service))
 
-	return systemd.New(globalRootDir, nil).GenSocketFile(
+	return systemd.New(dirs.GlobalRootDir, nil).GenSocketFile(
 		&systemd.ServiceDescription{
 			ServiceFileName: serviceFileName,
 			ListenStream:    service.ListenStream,
@@ -473,15 +474,15 @@
 }
 
 func generateServiceFileName(m *packageYaml, service ServiceYaml) string {
-	return filepath.Join(snapServicesDir, fmt.Sprintf("%s_%s_%s.service", m.Name, service.Name, m.Version))
+	return filepath.Join(dirs.SnapServicesDir, fmt.Sprintf("%s_%s_%s.service", m.Name, service.Name, m.Version))
 }
 
 func generateSocketFileName(m *packageYaml, service ServiceYaml) string {
-	return filepath.Join(snapServicesDir, fmt.Sprintf("%s_%s_%s.socket", m.Name, service.Name, m.Version))
+	return filepath.Join(dirs.SnapServicesDir, fmt.Sprintf("%s_%s_%s.socket", m.Name, service.Name, m.Version))
 }
 
 func generateBusPolicyFileName(m *packageYaml, service ServiceYaml) string {
-	return filepath.Join(snapBusPolicyDir, fmt.Sprintf("%s_%s_%s.conf", m.Name, service.Name, m.Version))
+	return filepath.Join(dirs.SnapBusPolicyDir, fmt.Sprintf("%s_%s_%s.conf", m.Name, service.Name, m.Version))
 }
 
 // takes a directory and removes the global root, this is needed
@@ -490,11 +491,11 @@
 var stripGlobalRootDir = stripGlobalRootDirImpl
 
 func stripGlobalRootDirImpl(dir string) string {
-	if globalRootDir == "/" {
+	if dirs.GlobalRootDir == "/" {
 		return dir
 	}
 
-	return dir[len(globalRootDir):]
+	return dir[len(dirs.GlobalRootDir):]
 }
 
 func (m *packageYaml) addPackageServices(baseDir string, inhibitHooks bool, inter interacter) error {
@@ -549,7 +550,7 @@
 		//
 		// *but* always run enable (which just sets a symlink)
 		serviceName := filepath.Base(generateServiceFileName(m, service))
-		sysd := systemd.New(globalRootDir, inter)
+		sysd := systemd.New(dirs.GlobalRootDir, inter)
 		if !inhibitHooks {
 			if err := sysd.DaemonReload(); err != nil {
 				return err
@@ -586,7 +587,7 @@
 }
 
 func (m *packageYaml) removePackageServices(baseDir string, inter interacter) error {
-	sysd := systemd.New(globalRootDir, inter)
+	sysd := systemd.New(dirs.GlobalRootDir, inter)
 	for _, service := range m.ServiceYamls {
 		serviceName := filepath.Base(generateServiceFileName(m, service))
 		if err := sysd.Disable(serviceName); err != nil {
@@ -628,7 +629,7 @@
 }
 
 func (m *packageYaml) addPackageBinaries(baseDir string) error {
-	if err := os.MkdirAll(snapBinariesDir, 0755); err != nil {
+	if err := os.MkdirAll(dirs.SnapBinariesDir, 0755); err != nil {
 		return err
 	}
 
@@ -673,7 +674,7 @@
 		return err
 	}
 
-	fn := filepath.Join(snapSeccompDir, profileName)
+	fn := filepath.Join(dirs.SnapSeccompDir, profileName)
 	if err := ioutil.WriteFile(fn, content, 0644); err != nil {
 		return err
 	}
@@ -706,7 +707,7 @@
 	if err != nil {
 		return err
 	}
-	fn := filepath.Join(snapSeccompDir, profileName)
+	fn := filepath.Join(dirs.SnapSeccompDir, profileName)
 	if err := os.Remove(fn); err != nil && !os.IsNotExist(err) {
 		return err
 	}
@@ -799,15 +800,15 @@
 // snapDataDirs returns the list of data directories for the given snap version
 func snapDataDirs(fullName, version string) ([]string, error) {
 	// collect the directories, homes first
-	dirs, err := filepath.Glob(filepath.Join(snapDataHomeGlob, fullName, version))
+	found, err := filepath.Glob(filepath.Join(dirs.SnapDataHomeGlob, fullName, version))
 	if err != nil {
 		return nil, err
 	}
 	// then system data
-	systemPath := filepath.Join(snapDataDir, fullName, version)
-	dirs = append(dirs, systemPath)
+	systemPath := filepath.Join(dirs.SnapDataDir, fullName, version)
+	found = append(found, systemPath)
 
-	return dirs, nil
+	return found, nil
 }
 
 // Copy all data for "fullName" from "oldVersion" to "newVersion"
 
=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-09-15 20:24:56 +0000
+++ snappy/click_test.go	2015-09-29 11:44:13 +0000
@@ -32,6 +32,7 @@
 	. "gopkg.in/check.v1"
 
 	"launchpad.net/snappy/clickdeb"
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/policy"
@@ -78,10 +79,10 @@
 	hookName, err := cfg.Get("hook", "Hook-Name")
 	c.Assert(err, IsNil)
 
-	if _, err := os.Stat(clickSystemHooksDir); err != nil {
-		os.MkdirAll(clickSystemHooksDir, 0755)
+	if _, err := os.Stat(dirs.ClickSystemHooksDir); err != nil {
+		os.MkdirAll(dirs.ClickSystemHooksDir, 0755)
 	}
-	ioutil.WriteFile(filepath.Join(clickSystemHooksDir, hookName+".hook"), []byte(hookContent), 0644)
+	ioutil.WriteFile(filepath.Join(dirs.ClickSystemHooksDir, hookName+".hook"), []byte(hookContent), 0644)
 }
 
 func (s *SnapTestSuite) TestReadClickHookFile(c *C) {
@@ -89,7 +90,7 @@
 User: root
 Exec: /usr/lib/click-systemd/systemd-clickhook
 Pattern: /var/lib/systemd/click/${id}`)
-	hook, err := readClickHookFile(filepath.Join(clickSystemHooksDir, "systemd.hook"))
+	hook, err := readClickHookFile(filepath.Join(dirs.ClickSystemHooksDir, "systemd.hook"))
 	c.Assert(err, IsNil)
 	c.Assert(hook.name, Equals, "systemd")
 	c.Assert(hook.user, Equals, "root")
@@ -99,7 +100,7 @@
 	// click allows non-existing "Hook-Name" and uses the filename then
 	makeClickHook(c, `Hook-Name: apparmor
 Pattern: /var/lib/apparmor/click/${id}`)
-	hook, err = readClickHookFile(filepath.Join(clickSystemHooksDir, "apparmor.hook"))
+	hook, err = readClickHookFile(filepath.Join(dirs.ClickSystemHooksDir, "apparmor.hook"))
 	c.Assert(err, IsNil)
 	c.Assert(hook.name, Equals, "apparmor")
 }
@@ -179,7 +180,7 @@
 	c.Assert(err, IsNil)
 	c.Check(name, Equals, "foo")
 
-	baseDir := filepath.Join(snapAppsDir, fooComposedName, "1.0")
+	baseDir := filepath.Join(dirs.SnapAppsDir, fooComposedName, "1.0")
 	contentFile := filepath.Join(baseDir, "bin", "foo")
 	content, err := ioutil.ReadFile(contentFile)
 	c.Assert(err, IsNil)
@@ -589,7 +590,7 @@
 }
 
 func (s *SnapTestSuite) TestClickCopyData(c *C) {
-	snapDataHomeGlob = filepath.Join(s.tempdir, "home", "*", "apps")
+	dirs.SnapDataHomeGlob = filepath.Join(s.tempdir, "home", "*", "apps")
 	homeDir := filepath.Join(s.tempdir, "home", "user1", "apps")
 	appDir := "foo." + testOrigin
 	homeData := filepath.Join(homeDir, appDir, "1.0")
@@ -605,7 +606,7 @@
 	snapFile := makeTestSnapPackage(c, packageYaml+"version: 1.0")
 	_, err = installClick(snapFile, AllowUnauthenticated, nil, testOrigin)
 	c.Assert(err, IsNil)
-	canaryDataFile := filepath.Join(snapDataDir, appDir, "1.0", "canary.txt")
+	canaryDataFile := filepath.Join(dirs.SnapDataDir, appDir, "1.0", "canary.txt")
 	err = ioutil.WriteFile(canaryDataFile, canaryData, 0644)
 	c.Assert(err, IsNil)
 	err = ioutil.WriteFile(filepath.Join(homeData, "canary.home"), canaryData, 0644)
@@ -614,7 +615,7 @@
 	snapFile = makeTestSnapPackage(c, packageYaml+"version: 2.0")
 	_, err = installClick(snapFile, AllowUnauthenticated, nil, testOrigin)
 	c.Assert(err, IsNil)
-	newCanaryDataFile := filepath.Join(snapDataDir, appDir, "2.0", "canary.txt")
+	newCanaryDataFile := filepath.Join(dirs.SnapDataDir, appDir, "2.0", "canary.txt")
 	content, err := ioutil.ReadFile(newCanaryDataFile)
 	c.Assert(err, IsNil)
 	c.Assert(content, DeepEquals, canaryData)
@@ -629,7 +630,7 @@
 // system data gets copied
 func (s *SnapTestSuite) TestClickCopyDataNoUserHomes(c *C) {
 	// this home dir path does not exist
-	snapDataHomeGlob = filepath.Join(s.tempdir, "no-such-home", "*", "apps")
+	dirs.SnapDataHomeGlob = filepath.Join(s.tempdir, "no-such-home", "*", "apps")
 
 	packageYaml := `name: foo
 icon: foo.svg
@@ -639,14 +640,14 @@
 	snapFile := makeTestSnapPackage(c, packageYaml+"version: 1.0")
 	_, err := installClick(snapFile, AllowUnauthenticated, nil, testOrigin)
 	c.Assert(err, IsNil)
-	canaryDataFile := filepath.Join(snapDataDir, appDir, "1.0", "canary.txt")
+	canaryDataFile := filepath.Join(dirs.SnapDataDir, appDir, "1.0", "canary.txt")
 	err = ioutil.WriteFile(canaryDataFile, []byte(""), 0644)
 	c.Assert(err, IsNil)
 
 	snapFile = makeTestSnapPackage(c, packageYaml+"version: 2.0")
 	_, err = installClick(snapFile, AllowUnauthenticated, nil, testOrigin)
 	c.Assert(err, IsNil)
-	_, err = os.Stat(filepath.Join(snapDataDir, appDir, "2.0", "canary.txt"))
+	_, err = os.Stat(filepath.Join(dirs.SnapDataDir, appDir, "2.0", "canary.txt"))
 	c.Assert(err, IsNil)
 }
 
@@ -675,14 +676,14 @@
 	snapFile := makeTestSnapPackage(c, packageYaml+"version: 1.0")
 	_, err := installClick(snapFile, AllowUnauthenticated, nil, testOrigin)
 	c.Assert(err, IsNil)
-	canaryDataFile := filepath.Join(snapDataDir, appDir, "1.0", "canary.txt")
+	canaryDataFile := filepath.Join(dirs.SnapDataDir, appDir, "1.0", "canary.txt")
 	err = ioutil.WriteFile(canaryDataFile, []byte(""), 0644)
 	c.Assert(err, IsNil)
 
 	snapFile = makeTestSnapPackage(c, packageYaml+"version: 2.0")
 	_, err = installClick(snapFile, AllowUnauthenticated, nil, testOrigin)
 	c.Assert(err, IsNil)
-	_, err = os.Stat(filepath.Join(snapDataDir, appDir, "2.0", "canary.txt"))
+	_, err = os.Stat(filepath.Join(dirs.SnapDataDir, appDir, "2.0", "canary.txt"))
 	c.Assert(err, IsNil)
 
 	// read the hook trace file, this shows that 1.0 was active, then
@@ -720,7 +721,7 @@
 	snapFile := makeTestSnapPackage(c, packageYaml+"version: 1.0")
 	_, err := installClick(snapFile, AllowUnauthenticated, nil, testOrigin)
 	c.Assert(err, IsNil)
-	canaryDataFile := filepath.Join(snapDataDir, appDir, "1.0", "canary.txt")
+	canaryDataFile := filepath.Join(dirs.SnapDataDir, appDir, "1.0", "canary.txt")
 	err = ioutil.WriteFile(canaryDataFile, []byte(""), 0644)
 	c.Assert(err, IsNil)
 
@@ -730,12 +731,12 @@
 
 	// installing 2.0 will fail in the hooks,
 	//   so ensure we fall back to v1.0
-	content, err := ioutil.ReadFile(filepath.Join(snapAppsDir, appDir, "current", "meta", "package.yaml"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppsDir, appDir, "current", "meta", "package.yaml"))
 	c.Assert(err, IsNil)
 	c.Assert(strings.Contains(string(content), "version: 1.0"), Equals, true)
 
 	// no leftovers from the failed install
-	_, err = os.Stat(filepath.Join(snapAppsDir, fooComposedName, "2.0"))
+	_, err = os.Stat(filepath.Join(dirs.SnapAppsDir, fooComposedName, "2.0"))
 	c.Assert(err, NotNil)
 }
 
@@ -846,11 +847,11 @@
 
 	// ensure that the binary wrapper file go generated with the right
 	// name
-	binaryWrapper := filepath.Join(snapBinariesDir, "foo.bar")
+	binaryWrapper := filepath.Join(dirs.SnapBinariesDir, "foo.bar")
 	c.Assert(helpers.FileExists(binaryWrapper), Equals, true)
 
 	// and that it gets removed on remove
-	snapDir := filepath.Join(snapAppsDir, "foo.mvo", "1.0")
+	snapDir := filepath.Join(dirs.SnapAppsDir, "foo.mvo", "1.0")
 	yamlPath := filepath.Join(snapDir, "meta", "package.yaml")
 	part, err := NewInstalledSnapPart(yamlPath, testOrigin)
 	c.Assert(err, IsNil)
@@ -873,8 +874,8 @@
 
 	// ensure that the binary wrapper file go generated with the right
 	// path
-	oldSnapBin := filepath.Join(snapAppsDir[len(globalRootDir):], "foo.mvo", "1.0", "bin", "bar")
-	binaryWrapper := filepath.Join(snapBinariesDir, "foo.bar")
+	oldSnapBin := filepath.Join(dirs.SnapAppsDir[len(dirs.GlobalRootDir):], "foo.mvo", "1.0", "bin", "bar")
+	binaryWrapper := filepath.Join(dirs.SnapBinariesDir, "foo.bar")
 	content, err := ioutil.ReadFile(binaryWrapper)
 	c.Assert(err, IsNil)
 	c.Assert(strings.Contains(string(content), oldSnapBin), Equals, true)
@@ -883,7 +884,7 @@
 	snapFile = makeTestSnapPackage(c, packageYaml+"version: 2.0")
 	_, err = installClick(snapFile, AllowUnauthenticated, nil, "mvo")
 	c.Assert(err, IsNil)
-	newSnapBin := filepath.Join(snapAppsDir[len(globalRootDir):], "foo.mvo", "2.0", "bin", "bar")
+	newSnapBin := filepath.Join(dirs.SnapAppsDir[len(dirs.GlobalRootDir):], "foo.mvo", "2.0", "bin", "bar")
 	content, err = ioutil.ReadFile(binaryWrapper)
 	c.Assert(err, IsNil)
 	c.Assert(strings.Contains(string(content), newSnapBin), Equals, true)
@@ -901,7 +902,7 @@
 	_, err := installClick(snapFile, AllowUnauthenticated, nil, "mvo")
 	c.Assert(err, IsNil)
 
-	servicesFile := filepath.Join(snapServicesDir, "foo_service_1.0.service")
+	servicesFile := filepath.Join(dirs.SnapServicesDir, "foo_service_1.0.service")
 	c.Assert(helpers.FileExists(servicesFile), Equals, true)
 	st, err := os.Stat(servicesFile)
 	c.Assert(err, IsNil)
@@ -909,7 +910,7 @@
 	c.Assert(st.Mode().String(), Equals, "-rw-r--r--")
 
 	// and that it gets removed on remove
-	snapDir := filepath.Join(snapAppsDir, "foo.mvo", "1.0")
+	snapDir := filepath.Join(dirs.SnapAppsDir, "foo.mvo", "1.0")
 	yamlPath := filepath.Join(snapDir, "meta", "package.yaml")
 	part, err := NewInstalledSnapPart(yamlPath, testOrigin)
 	c.Assert(err, IsNil)
@@ -945,8 +946,8 @@
 	_, err = installClick(snapFile, AllowUnauthenticated, inter, testOrigin)
 	c.Assert(err, IsNil)
 
-	c.Assert(helpers.FileExists(filepath.Join(snapServicesDir, "foo_svc1_1.0.service")), Equals, true)
-	c.Assert(helpers.FileExists(filepath.Join(snapServicesDir, "foo_svc2_1.0.service")), Equals, true)
+	c.Assert(helpers.FileExists(filepath.Join(dirs.SnapServicesDir, "foo_svc1_1.0.service")), Equals, true)
+	c.Assert(helpers.FileExists(filepath.Join(dirs.SnapServicesDir, "foo_svc2_1.0.service")), Equals, true)
 
 	return fmkYaml, inter
 }
@@ -966,12 +967,12 @@
 	c.Check(cmdlog, DeepEquals, []string{"stop", "show", "stop", "show", "start", "start"})
 
 	// check it got set active
-	content, err := ioutil.ReadFile(filepath.Join(snapAppsDir, "fmk", "current", "meta", "package.yaml"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppsDir, "fmk", "current", "meta", "package.yaml"))
 	c.Assert(err, IsNil)
 	c.Assert(strings.Contains(string(content), "version: 2"), Equals, true)
 
 	// just in case (cf. the following tests)
-	_, err = os.Stat(filepath.Join(snapAppsDir, "fmk", "2"))
+	_, err = os.Stat(filepath.Join(dirs.SnapAppsDir, "fmk", "2"))
 	c.Assert(err, IsNil)
 
 }
@@ -995,12 +996,12 @@
 	c.Check(cmdlog, DeepEquals, []string{"stop", "show", "stop", "start"})
 
 	// check it got rolled back
-	content, err := ioutil.ReadFile(filepath.Join(snapAppsDir, "fmk", "current", "meta", "package.yaml"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppsDir, "fmk", "current", "meta", "package.yaml"))
 	c.Assert(err, IsNil)
 	c.Assert(strings.Contains(string(content), "version: 1"), Equals, true)
 
 	// no leftovers from the failed install
-	_, err = os.Stat(filepath.Join(snapAppsDir, "fmk", "2"))
+	_, err = os.Stat(filepath.Join(dirs.SnapAppsDir, "fmk", "2"))
 	c.Assert(err, NotNil)
 }
 
@@ -1026,12 +1027,12 @@
 	})
 
 	// check it got rolled back
-	content, err := ioutil.ReadFile(filepath.Join(snapAppsDir, "fmk", "current", "meta", "package.yaml"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppsDir, "fmk", "current", "meta", "package.yaml"))
 	c.Assert(err, IsNil)
 	c.Assert(strings.Contains(string(content), "version: 1"), Equals, true)
 
 	// no leftovers from the failed install
-	_, err = os.Stat(filepath.Join(snapAppsDir, "fmk", "2"))
+	_, err = os.Stat(filepath.Join(dirs.SnapAppsDir, "fmk", "2"))
 	c.Assert(err, NotNil)
 
 }
@@ -1126,7 +1127,7 @@
 	// ensure that even with a global rootdir the paths in the generated
 	// .services file are setup correctly (i.e. that the global root
 	// is stripped)
-	c.Assert(globalRootDir, Not(Equals), "/")
+	c.Assert(dirs.GlobalRootDir, Not(Equals), "/")
 
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, "")
 	c.Assert(err, IsNil)
@@ -1195,7 +1196,7 @@
 	// ensure that even with a global rootdir the paths in the generated
 	// .services file are setup correctly (i.e. that the global root
 	// is stripped)
-	c.Assert(globalRootDir, Not(Equals), "/")
+	c.Assert(dirs.GlobalRootDir, Not(Equals), "/")
 
 	yamlFile, err := makeInstalledMockSnap(s.tempdir, "")
 	c.Assert(err, IsNil)
@@ -1490,14 +1491,14 @@
 `), false)
 	c.Assert(err, IsNil)
 
-	snapSeccompDir = c.MkDir()
+	dirs.SnapSeccompDir = c.MkDir()
 	err = m.addSecurityPolicy("/apps/foo.mvo/1.0/")
 	c.Assert(err, IsNil)
 
-	binSeccompContent, err := ioutil.ReadFile(filepath.Join(snapSeccompDir, "foo.mvo_foo_1.0"))
+	binSeccompContent, err := ioutil.ReadFile(filepath.Join(dirs.SnapSeccompDir, "foo.mvo_foo_1.0"))
 	c.Assert(string(binSeccompContent), Equals, scFilterGenFakeResult)
 
-	serviceSeccompContent, err := ioutil.ReadFile(filepath.Join(snapSeccompDir, "foo.mvo_bar_1.0"))
+	serviceSeccompContent, err := ioutil.ReadFile(filepath.Join(dirs.SnapSeccompDir, "foo.mvo_bar_1.0"))
 	c.Assert(string(serviceSeccompContent), Equals, scFilterGenFakeResult)
 
 }
@@ -1514,9 +1515,9 @@
 `), false)
 	c.Assert(err, IsNil)
 
-	snapSeccompDir = c.MkDir()
-	binSeccomp := filepath.Join(snapSeccompDir, "foo.mvo_foo_1.0")
-	serviceSeccomp := filepath.Join(snapSeccompDir, "foo.mvo_bar_1.0")
+	dirs.SnapSeccompDir = c.MkDir()
+	binSeccomp := filepath.Join(dirs.SnapSeccompDir, "foo.mvo_foo_1.0")
+	serviceSeccomp := filepath.Join(dirs.SnapSeccompDir, "foo.mvo_bar_1.0")
 	c.Assert(helpers.FileExists(binSeccomp), Equals, false)
 	c.Assert(helpers.FileExists(serviceSeccomp), Equals, false)
 
 
=== modified file 'snappy/datadir.go'
--- snappy/datadir.go	2015-05-20 17:24:29 +0000
+++ snappy/datadir.go	2015-09-29 11:44:13 +0000
@@ -22,6 +22,8 @@
 import (
 	"path/filepath"
 	"strings"
+
+	"launchpad.net/snappy/dirs"
 )
 
 // A SnapDataDir represents a single data directory for a version of a package
@@ -102,5 +104,5 @@
 
 // DataDirs returns the list of all SnapDataDirs in the system.
 func DataDirs(spec string) []SnapDataDir {
-	return append(data1(spec, snapDataHomeGlob), data1(spec, snapDataDir)...)
+	return append(data1(spec, dirs.SnapDataHomeGlob), data1(spec, dirs.SnapDataDir)...)
 }
 
=== modified file 'snappy/datadir_test.go'
--- snappy/datadir_test.go	2015-06-02 20:46:07 +0000
+++ snappy/datadir_test.go	2015-09-29 11:44:13 +0000
@@ -25,6 +25,8 @@
 	"strings"
 
 	. "gopkg.in/check.v1"
+
+	"launchpad.net/snappy/dirs"
 )
 
 type DataDirSuite struct{}
@@ -32,14 +34,14 @@
 var _ = Suite(&DataDirSuite{})
 
 func (s *DataDirSuite) SetUpTest(c *C) {
-	SetRootDir(c.MkDir())
+	dirs.SetRootDir(c.MkDir())
 }
 
 func (s *DataDirSuite) TestSystemDataDirs(c *C) {
-	c.Assert(os.MkdirAll(filepath.Join(snapDataDir, "foo.bar", "v1"), 0755), IsNil)
+	c.Assert(os.MkdirAll(filepath.Join(dirs.SnapDataDir, "foo.bar", "v1"), 0755), IsNil)
 	dds := DataDirs("foo")
 	c.Check(dds, DeepEquals, []SnapDataDir{{
-		Base:    snapDataDir,
+		Base:    dirs.SnapDataDir,
 		Name:    "foo",
 		Origin:  "bar",
 		Version: "v1",
@@ -52,10 +54,10 @@
 }
 
 func (s *DataDirSuite) TestDataDirsFramework(c *C) {
-	c.Assert(os.MkdirAll(filepath.Join(snapDataDir, "foo", "v1"), 0755), IsNil)
+	c.Assert(os.MkdirAll(filepath.Join(dirs.SnapDataDir, "foo", "v1"), 0755), IsNil)
 	dds := DataDirs("foo")
 	c.Check(dds, DeepEquals, []SnapDataDir{{
-		Base:    snapDataDir,
+		Base:    dirs.SnapDataDir,
 		Name:    "foo",
 		Origin:  "",
 		Version: "v1",
@@ -64,11 +66,11 @@
 }
 
 func (s *DataDirSuite) TestHomeDataDirs(c *C) {
-	home := strings.Replace(snapDataHomeGlob, "*", "user1", -1)
+	home := strings.Replace(dirs.SnapDataHomeGlob, "*", "user1", -1)
 	c.Assert(os.MkdirAll(filepath.Join(home, "foo.bar", "v1"), 0755), IsNil)
 	dds := DataDirs("foo")
 	c.Check(dds, DeepEquals, []SnapDataDir{{
-		Base:    snapDataHomeGlob,
+		Base:    dirs.SnapDataHomeGlob,
 		Name:    "foo",
 		Origin:  "bar",
 		Version: "v1",
@@ -76,39 +78,39 @@
 }
 
 func (s *DataDirSuite) TestEverywhichwhereDataDirs(c *C) {
-	home := strings.Replace(snapDataHomeGlob, "*", "user1", -1)
+	home := strings.Replace(dirs.SnapDataHomeGlob, "*", "user1", -1)
 	c.Assert(os.MkdirAll(filepath.Join(home, "foo.bar", "v0"), 0755), IsNil)
 	c.Assert(os.MkdirAll(filepath.Join(home, "foo.bar", "v1"), 0755), IsNil)
-	c.Assert(os.MkdirAll(filepath.Join(snapDataDir, "foo.xyzzy", "v1"), 0755), IsNil)
-	c.Assert(os.MkdirAll(filepath.Join(snapDataDir, "foo", "v3"), 0755), IsNil)
+	c.Assert(os.MkdirAll(filepath.Join(dirs.SnapDataDir, "foo.xyzzy", "v1"), 0755), IsNil)
+	c.Assert(os.MkdirAll(filepath.Join(dirs.SnapDataDir, "foo", "v3"), 0755), IsNil)
 	dds := DataDirs("foo")
 	c.Assert(dds, HasLen, 4)
 	hi := 0
 	si := 2
-	if dds[0].Base == snapDataDir {
+	if dds[0].Base == dirs.SnapDataDir {
 		si = 0
 		hi = 2
 	}
 	c.Check(dds[hi], DeepEquals, SnapDataDir{
-		Base:    snapDataHomeGlob,
+		Base:    dirs.SnapDataHomeGlob,
 		Name:    "foo",
 		Origin:  "bar",
 		Version: "v0",
 	})
 	c.Check(dds[hi+1], DeepEquals, SnapDataDir{
-		Base:    snapDataHomeGlob,
+		Base:    dirs.SnapDataHomeGlob,
 		Name:    "foo",
 		Origin:  "bar",
 		Version: "v1",
 	})
 	c.Check(dds[si], DeepEquals, SnapDataDir{
-		Base:    snapDataDir,
+		Base:    dirs.SnapDataDir,
 		Name:    "foo",
 		Origin:  "",
 		Version: "v3",
 	})
 	c.Check(dds[si+1], DeepEquals, SnapDataDir{
-		Base:    snapDataDir,
+		Base:    dirs.SnapDataDir,
 		Name:    "foo",
 		Origin:  "xyzzy",
 		Version: "v1",
 
=== modified file 'snappy/globals.go'
--- snappy/globals.go	2015-05-15 13:33:27 +0000
+++ snappy/globals.go	2015-09-29 11:44:13 +0000
@@ -22,6 +22,7 @@
 import (
 	"os"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/release"
 )
 
@@ -32,9 +33,9 @@
 		root = "/"
 	}
 
-	SetRootDir(root)
+	dirs.SetRootDir(root)
 
 	// we don't need to care for the error here to take into account when
 	// initialized on a non snappy system
-	release.Setup(globalRootDir)
+	release.Setup(dirs.GlobalRootDir)
 }
 
=== modified file 'snappy/hwaccess.go'
--- snappy/hwaccess.go	2015-09-25 12:49:25 +0000
+++ snappy/hwaccess.go	2015-09-29 11:44:13 +0000
@@ -29,6 +29,7 @@
 	"path/filepath"
 	"strings"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/helpers"
 )
 
@@ -43,7 +44,7 @@
 
 // return the json filename to add to the security json
 func getHWAccessJSONFile(snapname string) string {
-	return filepath.Join(snapAppArmorDir, fmt.Sprintf("%s.json.additional", snapname))
+	return filepath.Join(dirs.SnapAppArmorDir, fmt.Sprintf("%s.json.additional", snapname))
 }
 
 // Return true if the device string is a valid device
@@ -113,7 +114,7 @@
 
 func udevRulesPathForPart(partid string) string {
 	// use 70- here so that its read before the OEM rules
-	return filepath.Join(snapUdevRulesDir, fmt.Sprintf("70-snappy_hwassign_%s.rules", partid))
+	return filepath.Join(dirs.SnapUdevRulesDir, fmt.Sprintf("70-snappy_hwassign_%s.rules", partid))
 }
 
 func addUdevRuleForSnap(snapname, newRule string) error {
@@ -137,7 +138,7 @@
 }
 
 func writeUdevRuleForDeviceCgroup(snapname, device string) error {
-	os.MkdirAll(snapUdevRulesDir, 0755)
+	os.MkdirAll(dirs.SnapUdevRulesDir, 0755)
 
 	// the device cgroup/launcher etc support only the apps level,
 	// not a binary/service or version, so if we get a full
@@ -168,7 +169,7 @@
 	}
 
 	// check if there is anything apparmor related to add to
-	globExpr := filepath.Join(snapAppArmorDir, fmt.Sprintf("%s_*.json", snapname))
+	globExpr := filepath.Join(dirs.SnapAppArmorDir, fmt.Sprintf("%s_*.json", snapname))
 	matches, err := filepath.Glob(globExpr)
 	if err != nil {
 		return err
 
=== modified file 'snappy/hwaccess_test.go'
--- snappy/hwaccess_test.go	2015-09-22 15:27:35 +0000
+++ snappy/hwaccess_test.go	2015-09-29 11:44:13 +0000
@@ -23,9 +23,10 @@
 	"io/ioutil"
 	"path/filepath"
 
+	. "gopkg.in/check.v1"
+
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/helpers"
-
-	. "gopkg.in/check.v1"
 )
 
 func mockRegenerateAppArmorRules() *bool {
@@ -43,7 +44,7 @@
 
 	err := AddHWAccess("hello-app", "/dev/ttyUSB0")
 	c.Assert(err, IsNil)
-	content, err := ioutil.ReadFile(filepath.Join(snapAppArmorDir, "hello-app.json.additional"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppArmorDir, "hello-app.json.additional"))
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, `{
   "write_path": [
@@ -76,7 +77,7 @@
 	err = AddHWAccess("hello-app", "/sys/devices/gpio1")
 	c.Assert(err, IsNil)
 
-	content, err := ioutil.ReadFile(filepath.Join(snapAppArmorDir, "hello-app.json.additional"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppArmorDir, "hello-app.json.additional"))
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, `{
   "write_path": [
@@ -160,7 +161,7 @@
 
 	// check that the udev rules file got created
 	udevRulesFilename := "70-snappy_hwassign_hello-app.rules"
-	c.Assert(helpers.FileExists(filepath.Join(snapUdevRulesDir, udevRulesFilename)), Equals, true)
+	c.Assert(helpers.FileExists(filepath.Join(dirs.SnapUdevRulesDir, udevRulesFilename)), Equals, true)
 
 	writePaths, err := ListHWAccess("hello-app")
 	c.Assert(err, IsNil)
@@ -176,10 +177,10 @@
 	c.Assert(writePaths, HasLen, 0)
 
 	// check that the udev rules file got removed on unassign
-	c.Assert(helpers.FileExists(filepath.Join(snapUdevRulesDir, udevRulesFilename)), Equals, false)
+	c.Assert(helpers.FileExists(filepath.Join(dirs.SnapUdevRulesDir, udevRulesFilename)), Equals, false)
 
 	// check the json.additional got cleaned out
-	content, err := ioutil.ReadFile(filepath.Join(snapAppArmorDir, "hello-app.json.additional"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppArmorDir, "hello-app.json.additional"))
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, "{}\n")
 }
@@ -196,7 +197,7 @@
 	c.Assert(writePaths, DeepEquals, []string{"/dev/bar", "/dev/bar*"})
 
 	// check the file only lists udevReadGlob once
-	content, err := ioutil.ReadFile(filepath.Join(snapAppArmorDir, "hello-app.json.additional"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppArmorDir, "hello-app.json.additional"))
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, `{
   "write_path": [
@@ -210,7 +211,7 @@
 `)
 
 	// check the udev rule file contains all the rules
-	content, err = ioutil.ReadFile(filepath.Join(snapUdevRulesDir, "70-snappy_hwassign_hello-app.rules"))
+	content, err = ioutil.ReadFile(filepath.Join(dirs.SnapUdevRulesDir, "70-snappy_hwassign_hello-app.rules"))
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, `
 KERNEL=="bar", TAG:="snappy-assign", ENV{SNAPPY_APP}:="hello-app"
@@ -226,7 +227,7 @@
 	c.Assert(writePaths, DeepEquals, []string{"/dev/bar*"})
 
 	// check udevReadGlob is still there
-	content, err = ioutil.ReadFile(filepath.Join(snapAppArmorDir, "hello-app.json.additional"))
+	content, err = ioutil.ReadFile(filepath.Join(dirs.SnapAppArmorDir, "hello-app.json.additional"))
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, `{
   "write_path": [
@@ -238,7 +239,7 @@
 }
 `)
 	// check the udevReadGlob Udev rule is still there
-	content, err = ioutil.ReadFile(filepath.Join(snapUdevRulesDir, "70-snappy_hwassign_hello-app.rules"))
+	content, err = ioutil.ReadFile(filepath.Join(dirs.SnapUdevRulesDir, "70-snappy_hwassign_hello-app.rules"))
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, `KERNEL=="bar*", TAG:="snappy-assign", ENV{SNAPPY_APP}:="hello-app"
 `)
@@ -280,7 +281,7 @@
 	err := writeUdevRuleForDeviceCgroup(snapapp, "/dev/ttyS0")
 	c.Assert(err, IsNil)
 
-	got, err := ioutil.ReadFile(filepath.Join(snapUdevRulesDir, "70-snappy_hwassign_foo-app.rules"))
+	got, err := ioutil.ReadFile(filepath.Join(dirs.SnapUdevRulesDir, "70-snappy_hwassign_foo-app.rules"))
 	c.Assert(err, IsNil)
 	c.Assert(string(got), Equals, `
 KERNEL=="ttyS0", TAG:="snappy-assign", ENV{SNAPPY_APP}:="foo-app"
@@ -299,8 +300,8 @@
 	c.Check(*regenerateAppArmorRulesWasCalled, Equals, false)
 	c.Check(RemoveAllHWAccess("hello-app"), IsNil)
 
-	c.Check(helpers.FileExists(filepath.Join(snapUdevRulesDir, "70-snappy_hwassign_foo-app.rules")), Equals, false)
-	c.Check(helpers.FileExists(filepath.Join(snapAppArmorDir, "hello-app.json.additional")), Equals, false)
+	c.Check(helpers.FileExists(filepath.Join(dirs.SnapUdevRulesDir, "70-snappy_hwassign_foo-app.rules")), Equals, false)
+	c.Check(helpers.FileExists(filepath.Join(dirs.SnapAppArmorDir, "hello-app.json.additional")), Equals, false)
 	c.Check(*regenerateAppArmorRulesWasCalled, Equals, true)
 }
 
 
=== modified file 'snappy/install_test.go'
--- snappy/install_test.go	2015-09-29 00:32:37 +0000
+++ snappy/install_test.go	2015-09-29 11:44:13 +0000
@@ -30,6 +30,8 @@
 	"path/filepath"
 
 	. "gopkg.in/check.v1"
+
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/partition"
 	"launchpad.net/snappy/progress"
 )
@@ -50,7 +52,7 @@
 }
 
 func (s *SnapTestSuite) installThree(c *C, flags InstallFlags) {
-	snapDataHomeGlob = filepath.Join(s.tempdir, "home", "*", "apps")
+	dirs.SnapDataHomeGlob = filepath.Join(s.tempdir, "home", "*", "apps")
 	homeDir := filepath.Join(s.tempdir, "home", "user1", "apps")
 	homeData := filepath.Join(homeDir, "foo", "1.0")
 	err := os.MkdirAll(homeData, 0755)
@@ -77,12 +79,12 @@
 func (s *SnapTestSuite) TestClickInstallGCSimple(c *C) {
 	s.installThree(c, AllowUnauthenticated|DoInstallGC)
 
-	globs, err := filepath.Glob(filepath.Join(snapAppsDir, "foo.sideload", "*"))
+	globs, err := filepath.Glob(filepath.Join(dirs.SnapAppsDir, "foo.sideload", "*"))
 	c.Check(err, IsNil)
 	c.Check(globs, HasLen, 2+1) // +1 for "current"
 
 	// gc should leave one more data than app
-	globs, err = filepath.Glob(filepath.Join(snapDataDir, "foo.sideload", "*"))
+	globs, err = filepath.Glob(filepath.Join(dirs.SnapDataDir, "foo.sideload", "*"))
 	c.Check(err, IsNil)
 	c.Check(globs, HasLen, 3+1) // +1 for "current"
 }
@@ -91,11 +93,11 @@
 func (s *SnapTestSuite) TestClickInstallGCSuppressed(c *C) {
 	s.installThree(c, AllowUnauthenticated)
 
-	globs, err := filepath.Glob(filepath.Join(snapAppsDir, "foo.sideload", "*"))
+	globs, err := filepath.Glob(filepath.Join(dirs.SnapAppsDir, "foo.sideload", "*"))
 	c.Assert(err, IsNil)
 	c.Assert(globs, HasLen, 3+1) // +1 for "current"
 
-	globs, err = filepath.Glob(filepath.Join(snapDataDir, "foo.sideload", "*"))
+	globs, err = filepath.Glob(filepath.Join(dirs.SnapDataDir, "foo.sideload", "*"))
 	c.Check(err, IsNil)
 	c.Check(globs, HasLen, 3+1) // +1 for "current"
 }
 
=== modified file 'snappy/oem.go'
--- snappy/oem.go	2015-07-01 14:48:33 +0000
+++ snappy/oem.go	2015-09-29 11:44:13 +0000
@@ -31,6 +31,7 @@
 	"path/filepath"
 	"strings"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/pkg"
 )
@@ -141,7 +142,7 @@
 	}
 
 	fileList := make(map[string]string)
-	oemPath := filepath.Join(snapOemDir, oem.Name, oem.Version)
+	oemPath := filepath.Join(dirs.SnapOemDir, oem.Name, oem.Version)
 
 	for _, asset := range oem.OEM.Hardware.BootAssets.Files {
 		orig := filepath.Join(oemPath, asset.Path)
@@ -184,7 +185,7 @@
 }
 
 func cleanupOemHardwareUdevRules(m *packageYaml) error {
-	oldFiles, err := filepath.Glob(filepath.Join(snapUdevRulesDir, fmt.Sprintf("80-snappy_%s_*.rules", m.Name)))
+	oldFiles, err := filepath.Glob(filepath.Join(dirs.SnapUdevRulesDir, fmt.Sprintf("80-snappy_%s_*.rules", m.Name)))
 	if err != nil {
 		return err
 	}
@@ -195,7 +196,7 @@
 
 	// cleanup the additional files
 	for _, h := range m.OEM.Hardware.Assign {
-		jsonAdditionalPath := filepath.Join(snapAppArmorDir, fmt.Sprintf("%s.json.additional", h.PartID))
+		jsonAdditionalPath := filepath.Join(dirs.SnapAppArmorDir, fmt.Sprintf("%s.json.additional", h.PartID))
 		err = os.Remove(jsonAdditionalPath)
 		if err != nil && !os.IsNotExist(err) {
 			logger.Noticef("Failed to remove %q: %v", jsonAdditionalPath, err)
@@ -206,7 +207,7 @@
 }
 
 func writeOemHardwareUdevRules(m *packageYaml) error {
-	os.MkdirAll(snapUdevRulesDir, 0755)
+	os.MkdirAll(dirs.SnapUdevRulesDir, 0755)
 
 	// cleanup
 	if err := cleanupOemHardwareUdevRules(m); err != nil {
@@ -218,7 +219,7 @@
 		if err != nil {
 			return err
 		}
-		outfile := filepath.Join(snapUdevRulesDir, fmt.Sprintf("80-snappy_%s_%s.rules", m.Name, h.PartID))
+		outfile := filepath.Join(dirs.SnapUdevRulesDir, fmt.Sprintf("80-snappy_%s_%s.rules", m.Name, h.PartID))
 		if err := ioutil.WriteFile(outfile, []byte(rulesContent), 0644); err != nil {
 			return err
 		}
@@ -262,12 +263,12 @@
 // and the ubuntu-core-launcher is then used to generate a confinement
 // based on the devices cgroup.
 func writeApparmorAdditionalFile(m *packageYaml) error {
-	if err := os.MkdirAll(snapAppArmorDir, 0755); err != nil {
+	if err := os.MkdirAll(dirs.SnapAppArmorDir, 0755); err != nil {
 		return err
 	}
 
 	for _, h := range m.OEM.Hardware.Assign {
-		jsonAdditionalPath := filepath.Join(snapAppArmorDir, fmt.Sprintf("%s.json.additional", h.PartID))
+		jsonAdditionalPath := filepath.Join(dirs.SnapAppArmorDir, fmt.Sprintf("%s.json.additional", h.PartID))
 		if err := ioutil.WriteFile(jsonAdditionalPath, []byte(apparmorAdditionalContent), 0644); err != nil {
 			return err
 		}
 
=== modified file 'snappy/oem_test.go'
--- snappy/oem_test.go	2015-09-15 20:24:56 +0000
+++ snappy/oem_test.go	2015-09-29 11:44:13 +0000
@@ -26,9 +26,10 @@
 	"io/ioutil"
 	"path/filepath"
 
+	. "gopkg.in/check.v1"
+
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/helpers"
-
-	. "gopkg.in/check.v1"
 )
 
 type OemSuite struct {
@@ -72,7 +73,7 @@
 	err = writeApparmorAdditionalFile(m)
 	c.Assert(err, IsNil)
 
-	content, err := ioutil.ReadFile(filepath.Join(snapAppArmorDir, "device-hive-iot-hal.json.additional"))
+	content, err := ioutil.ReadFile(filepath.Join(dirs.SnapAppArmorDir, "device-hive-iot-hal.json.additional"))
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, apparmorAdditionalContent)
 }
@@ -84,7 +85,7 @@
 	err = writeApparmorAdditionalFile(m)
 	c.Assert(err, IsNil)
 
-	additionalFile := filepath.Join(snapAppArmorDir, "device-hive-iot-hal.json.additional")
+	additionalFile := filepath.Join(dirs.SnapAppArmorDir, "device-hive-iot-hal.json.additional")
 	c.Assert(helpers.FileExists(additionalFile), Equals, true)
 
 	err = cleanupOemHardwareUdevRules(m)
 
=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-09-23 11:42:22 +0000
+++ snappy/parts.go	2015-09-29 11:44:13 +0000
@@ -27,6 +27,7 @@
 	"strings"
 	"time"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
 )
@@ -139,10 +140,10 @@
 	if repo := NewSystemImageRepository(); repo != nil {
 		m.all = append(m.all, repo)
 	}
-	if repo := NewLocalSnapRepository(snapAppsDir); repo != nil {
+	if repo := NewLocalSnapRepository(dirs.SnapAppsDir); repo != nil {
 		m.all = append(m.all, repo)
 	}
-	if repo := NewLocalSnapRepository(snapOemDir); repo != nil {
+	if repo := NewLocalSnapRepository(dirs.SnapOemDir); repo != nil {
 		m.all = append(m.all, repo)
 	}
 
@@ -347,10 +348,10 @@
 // iconPath returns the would be path for the local icon
 func iconPath(s Part) string {
 	// TODO: care about extension ever being different than png
-	return filepath.Join(snapIconsDir, fmt.Sprintf("%s_%s.png", QualifiedName(s), s.Version()))
+	return filepath.Join(dirs.SnapIconsDir, fmt.Sprintf("%s_%s.png", QualifiedName(s), s.Version()))
 }
 
 // manifestPath returns the would be path for the store manifest meta data
 func manifestPath(s Part) string {
-	return filepath.Join(snapMetaDir, fmt.Sprintf("%s_%s.manifest", QualifiedName(s), s.Version()))
+	return filepath.Join(dirs.SnapMetaDir, fmt.Sprintf("%s_%s.manifest", QualifiedName(s), s.Version()))
 }
 
=== modified file 'snappy/parts_test.go'
--- snappy/parts_test.go	2015-09-23 11:42:22 +0000
+++ snappy/parts_test.go	2015-09-29 11:44:13 +0000
@@ -26,6 +26,7 @@
 
 	. "gopkg.in/check.v1"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
 )
@@ -96,7 +97,7 @@
 
 func (s *SnapTestSuite) TestFindSnapsByNameNotAvailable(c *C) {
 	_, err := makeInstalledMockSnap(s.tempdir, "")
-	repo := NewLocalSnapRepository(snapAppsDir)
+	repo := NewLocalSnapRepository(dirs.SnapAppsDir)
 	installed, err := repo.Installed()
 	c.Assert(err, IsNil)
 
@@ -106,7 +107,7 @@
 
 func (s *SnapTestSuite) TestFindSnapsByNameFound(c *C) {
 	_, err := makeInstalledMockSnap(s.tempdir, "")
-	repo := NewLocalSnapRepository(snapAppsDir)
+	repo := NewLocalSnapRepository(dirs.SnapAppsDir)
 	installed, err := repo.Installed()
 	c.Assert(err, IsNil)
 	c.Assert(installed, HasLen, 1)
@@ -118,7 +119,7 @@
 
 func (s *SnapTestSuite) TestFindSnapsByNameWithOrigin(c *C) {
 	_, err := makeInstalledMockSnap(s.tempdir, "")
-	repo := NewLocalSnapRepository(snapAppsDir)
+	repo := NewLocalSnapRepository(dirs.SnapAppsDir)
 	installed, err := repo.Installed()
 	c.Assert(err, IsNil)
 	c.Assert(installed, HasLen, 1)
@@ -130,7 +131,7 @@
 
 func (s *SnapTestSuite) TestFindSnapsByNameWithOriginNotThere(c *C) {
 	_, err := makeInstalledMockSnap(s.tempdir, "")
-	repo := NewLocalSnapRepository(snapAppsDir)
+	repo := NewLocalSnapRepository(dirs.SnapAppsDir)
 	installed, err := repo.Installed()
 	c.Assert(err, IsNil)
 	c.Assert(installed, HasLen, 1)
@@ -162,7 +163,7 @@
 
 func (s *SnapTestSuite) TestFindSnapsByNameAndVersion(c *C) {
 	_, err := makeInstalledMockSnap(s.tempdir, "")
-	repo := NewLocalSnapRepository(snapAppsDir)
+	repo := NewLocalSnapRepository(dirs.SnapAppsDir)
 	installed, err := repo.Installed()
 	c.Assert(err, IsNil)
 
@@ -185,7 +186,7 @@
 
 func (s *SnapTestSuite) TestFindSnapsByNameAndVersionFmk(c *C) {
 	_, err := makeInstalledMockSnap(s.tempdir, "name: fmk\ntype: framework\nversion: 1\nvendor: foo")
-	repo := NewLocalSnapRepository(snapAppsDir)
+	repo := NewLocalSnapRepository(dirs.SnapAppsDir)
 	installed, err := repo.Installed()
 	c.Assert(err, IsNil)
 
 
=== modified file 'snappy/purge.go'
--- snappy/purge.go	2015-05-29 12:08:46 +0000
+++ snappy/purge.go	2015-09-29 11:44:13 +0000
@@ -23,6 +23,7 @@
 	"fmt"
 	"path/filepath"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/progress"
 )
 
@@ -50,7 +51,7 @@
 	var active []*SnapPart
 
 	for _, datadir := range datadirs {
-		yamlPath := filepath.Join(snapAppsDir, datadir.QualifiedName(), datadir.Version, "meta", "package.yaml")
+		yamlPath := filepath.Join(dirs.SnapAppsDir, datadir.QualifiedName(), datadir.Version, "meta", "package.yaml")
 		part, err := NewInstalledSnapPart(yamlPath, datadir.Origin)
 		if err != nil {
 			// no such part installed
 
=== modified file 'snappy/purge_test.go'
--- snappy/purge_test.go	2015-09-29 00:32:37 +0000
+++ snappy/purge_test.go	2015-09-29 11:44:13 +0000
@@ -27,6 +27,7 @@
 
 	. "gopkg.in/check.v1"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/systemd"
 )
@@ -39,13 +40,13 @@
 
 func (s *purgeSuite) SetUpTest(c *C) {
 	s.tempdir = c.MkDir()
-	SetRootDir(s.tempdir)
-	os.MkdirAll(filepath.Join(snapServicesDir, "multi-user.target.wants"), 0755)
+	dirs.SetRootDir(s.tempdir)
+	os.MkdirAll(filepath.Join(dirs.SnapServicesDir, "multi-user.target.wants"), 0755)
 	systemd.SystemctlCmd = func(cmd ...string) ([]byte, error) {
 		return []byte("ActiveState=inactive\n"), nil
 	}
 
-	snapSeccompDir = c.MkDir()
+	dirs.SnapSeccompDir = c.MkDir()
 	runScFilterGen = mockRunScFilterGen
 }
 
@@ -78,7 +79,7 @@
 	c.Assert(os.MkdirAll(filepath.Join(pkgdir, ".click", "info"), 0755), IsNil)
 	c.Assert(ioutil.WriteFile(filepath.Join(pkgdir, ".click", "info", app+".manifest"), []byte(`{"name": "`+app+`"}`), 0644), IsNil)
 
-	dataDir = filepath.Join(snapDataDir, app, version)
+	dataDir = filepath.Join(dirs.SnapDataDir, app, version)
 	c.Assert(os.MkdirAll(dataDir, 0755), IsNil)
 	canaryDataFile := filepath.Join(dataDir, "canary.txt")
 	err = ioutil.WriteFile(canaryDataFile, []byte(""), 0644)
 
=== modified file 'snappy/security.go'
--- snappy/security.go	2015-09-15 12:55:09 +0000
+++ snappy/security.go	2015-09-29 11:44:13 +0000
@@ -30,6 +30,7 @@
 
 	"gopkg.in/yaml.v2"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/pkg"
 )
@@ -138,7 +139,7 @@
 		return content, err
 	}
 
-	os.MkdirAll(snapSeccompDir, 0755)
+	os.MkdirAll(dirs.SnapSeccompDir, 0755)
 
 	// defaults
 	policyVendor := defaultPolicyVendor
@@ -187,7 +188,7 @@
 	// Build up the command line
 	args := []string{
 		"sc-filtergen",
-		fmt.Sprintf("--include-policy-dir=%s", filepath.Dir(snapSeccompDir)),
+		fmt.Sprintf("--include-policy-dir=%s", filepath.Dir(dirs.SnapSeccompDir)),
 		fmt.Sprintf("--policy-vendor=%s", policyVendor),
 		fmt.Sprintf("--policy-version=%.2f", policyVersion),
 		fmt.Sprintf("--template=%s", template),
 
=== modified file 'snappy/security_test.go'
--- snappy/security_test.go	2015-09-15 20:24:56 +0000
+++ snappy/security_test.go	2015-09-29 11:44:13 +0000
@@ -27,6 +27,7 @@
 
 	. "gopkg.in/check.v1"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/pkg"
 )
 
@@ -216,7 +217,7 @@
 	// sc-filtergen is called with mostly defaults
 	c.Assert(a.scFilterGenCall, DeepEquals, []string{
 		"sc-filtergen",
-		fmt.Sprintf("--include-policy-dir=%s", filepath.Dir(snapSeccompDir)),
+		fmt.Sprintf("--include-policy-dir=%s", filepath.Dir(dirs.SnapSeccompDir)),
 		"--policy-vendor=ubuntu-core",
 		"--policy-version=15.04",
 		"--template=something",
@@ -237,7 +238,7 @@
 	// sc-filtergen is called with mostly defaults
 	c.Assert(a.scFilterGenCall, DeepEquals, []string{
 		"sc-filtergen",
-		fmt.Sprintf("--include-policy-dir=%s", filepath.Dir(snapSeccompDir)),
+		fmt.Sprintf("--include-policy-dir=%s", filepath.Dir(dirs.SnapSeccompDir)),
 		"--policy-vendor=ubuntu-core",
 		"--policy-version=15.04",
 		"--template=something",
@@ -269,7 +270,7 @@
 	// sc-filtergen is called with custom seccomp options
 	c.Assert(a.scFilterGenCall, DeepEquals, []string{
 		"sc-filtergen",
-		fmt.Sprintf("--include-policy-dir=%s", filepath.Dir(snapSeccompDir)),
+		fmt.Sprintf("--include-policy-dir=%s", filepath.Dir(dirs.SnapSeccompDir)),
 		"--policy-vendor=policy-vendor",
 		"--policy-version=18.10",
 		"--template=security-template",
 
=== modified file 'snappy/service.go'
--- snappy/service.go	2015-09-15 00:56:26 +0000
+++ snappy/service.go	2015-09-29 11:44:13 +0000
@@ -24,6 +24,7 @@
 	"path/filepath"
 	"time"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/i18n"
 	"launchpad.net/snappy/progress"
 	"launchpad.net/snappy/systemd"
@@ -105,7 +106,7 @@
 	return &serviceActor{
 		svcs: svcs,
 		pb:   pb,
-		sysd: systemd.New(globalRootDir, pb),
+		sysd: systemd.New(dirs.GlobalRootDir, pb),
 	}, nil
 }
 
 
=== modified file 'snappy/service_test.go'
--- snappy/service_test.go	2015-09-14 12:29:15 +0000
+++ snappy/service_test.go	2015-09-29 11:44:13 +0000
@@ -21,13 +21,14 @@
 
 import (
 	"errors"
+	"os"
+	"path/filepath"
 
 	. "gopkg.in/check.v1"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/progress"
 	"launchpad.net/snappy/systemd"
-	"os"
-	"path/filepath"
 )
 
 type ServiceActorSuite struct {
@@ -74,12 +75,12 @@
 	// force UTC timezone, for reproducible timestamps
 	os.Setenv("TZ", "")
 
-	SetRootDir(c.MkDir())
+	dirs.SetRootDir(c.MkDir())
 	// TODO: this mkdir hack is so enable doesn't fail; remove when enable is the same as the rest
-	c.Assert(os.MkdirAll(filepath.Join(globalRootDir, "/etc/systemd/system/multi-user.target.wants"), 0755), IsNil)
+	c.Assert(os.MkdirAll(filepath.Join(dirs.GlobalRootDir, "/etc/systemd/system/multi-user.target.wants"), 0755), IsNil)
 	systemd.SystemctlCmd = s.myRun
 	systemd.JournalctlCmd = s.myJctl
-	makeInstalledMockSnap(globalRootDir, "")
+	makeInstalledMockSnap(dirs.GlobalRootDir, "")
 	s.i = 0
 	s.argses = nil
 	s.errors = nil
@@ -98,7 +99,7 @@
 
 func (s *ServiceActorSuite) TestFindServicesNoPackagesNoPattern(c *C) {
 	// tricky way of hiding the installed package ;)
-	SetRootDir(c.MkDir())
+	dirs.SetRootDir(c.MkDir())
 	actor, err := FindServices("", "", s.pb)
 	c.Check(err, IsNil)
 	c.Assert(actor, NotNil)
 
=== modified file 'snappy/set_test.go'
--- snappy/set_test.go	2015-09-29 00:32:37 +0000
+++ snappy/set_test.go	2015-09-29 11:44:13 +0000
@@ -25,6 +25,7 @@
 
 	. "gopkg.in/check.v1"
 
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
 )
@@ -77,13 +78,13 @@
 func (s *SnapTestSuite) TestSetActive(c *C) {
 	makeTwoTestSnaps(c, pkg.TypeApp)
 
-	path, err := filepath.EvalSymlinks(filepath.Join(snapAppsDir, fooComposedName, "current"))
+	path, err := filepath.EvalSymlinks(filepath.Join(dirs.SnapAppsDir, fooComposedName, "current"))
 	c.Assert(err, IsNil)
-	c.Check(path, Equals, filepath.Join(snapAppsDir, fooComposedName, "2.0"))
+	c.Check(path, Equals, filepath.Join(dirs.SnapAppsDir, fooComposedName, "2.0"))
 
-	path, err = filepath.EvalSymlinks(filepath.Join(snapDataDir, fooComposedName, "current"))
+	path, err = filepath.EvalSymlinks(filepath.Join(dirs.SnapDataDir, fooComposedName, "current"))
 	c.Assert(err, IsNil)
-	c.Check(path, Equals, filepath.Join(snapDataDir, fooComposedName, "2.0"))
+	c.Check(path, Equals, filepath.Join(dirs.SnapDataDir, fooComposedName, "2.0"))
 
 	meter := &MockProgressMeter{}
 
@@ -98,8 +99,8 @@
 
 	err = makeSnapActiveByNameAndVersion("foo", "1.0", meter)
 	c.Assert(err, IsNil)
-	path, _ = filepath.EvalSymlinks(filepath.Join(snapAppsDir, fooComposedName, "current"))
-	c.Check(path, Equals, filepath.Join(snapAppsDir, fooComposedName, "1.0"))
-	path, _ = filepath.EvalSymlinks(filepath.Join(snapDataDir, fooComposedName, "current"))
-	c.Check(path, Equals, filepath.Join(snapDataDir, fooComposedName, "1.0"))
+	path, _ = filepath.EvalSymlinks(filepath.Join(dirs.SnapAppsDir, fooComposedName, "current"))
+	c.Check(path, Equals, filepath.Join(dirs.SnapAppsDir, fooComposedName, "1.0"))
+	path, _ = filepath.EvalSymlinks(filepath.Join(dirs.SnapDataDir, fooComposedName, "current"))
+	c.Check(path, Equals, filepath.Join(dirs.SnapDataDir, fooComposedName, "1.0"))
 }
 
=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-09-29 00:32:37 +0000
+++ snappy/snapp.go	2015-09-29 11:44:13 +0000
@@ -39,6 +39,7 @@
 	"gopkg.in/yaml.v2"
 
 	"launchpad.net/snappy/clickdeb"
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/oauth"
@@ -584,10 +585,10 @@
 		return nil, err
 	}
 
-	targetDir := snapAppsDir
+	targetDir := dirs.SnapAppsDir
 	// the "oem" parts are special
 	if m.Type == pkg.TypeOem {
-		targetDir = snapOemDir
+		targetDir = dirs.SnapOemDir
 	}
 
 	if origin == SideloadedOrigin {
@@ -823,7 +824,7 @@
 	}
 
 	fullName := QualifiedName(s)
-	dataDir := filepath.Join(snapDataDir, fullName, s.Version())
+	dataDir := filepath.Join(dirs.SnapDataDir, fullName, s.Version())
 
 	var oldPart *SnapPart
 	if currentActiveDir, _ := filepath.EvalSymlinks(filepath.Join(s.basedir, "..", "current")); currentActiveDir != "" {
@@ -849,7 +850,7 @@
 
 	// we need to call the external helper so that we can reliable drop
 	// privs
-	if err := s.deb.UnpackWithDropPrivs(s.basedir, globalRootDir); err != nil {
+	if err := s.deb.UnpackWithDropPrivs(s.basedir, dirs.GlobalRootDir); err != nil {
 		return "", err
 	}
 
@@ -926,7 +927,7 @@
 			return "", err
 		}
 
-		sysd := systemd.New(globalRootDir, inter)
+		sysd := systemd.New(dirs.GlobalRootDir, inter)
 		stopped := make(map[string]time.Duration)
 		defer func() {
 			if err != nil {
@@ -1007,7 +1008,7 @@
 	}
 
 	if s.Type() == pkg.TypeFramework {
-		if err := policy.Install(s.Name(), s.basedir, globalRootDir); err != nil {
+		if err := policy.Install(s.Name(), s.basedir, dirs.GlobalRootDir); err != nil {
 			return err
 		}
 	}
@@ -1036,7 +1037,7 @@
 		logger.Noticef("Failed to remove %q: %v", currentActiveSymlink, err)
 	}
 
-	dbase := filepath.Join(snapDataDir, QualifiedName(s))
+	dbase := filepath.Join(dirs.SnapDataDir, QualifiedName(s))
 	currentDataSymlink := filepath.Join(dbase, "current")
 	if err := os.Remove(currentDataSymlink); err != nil && !os.IsNotExist(err) {
 		logger.Noticef("Failed to remove %q: %v", currentDataSymlink, err)
@@ -1083,7 +1084,7 @@
 	}
 
 	if s.Type() == pkg.TypeFramework {
-		if err := policy.Remove(s.Name(), s.basedir, globalRootDir); err != nil {
+		if err := policy.Remove(s.Name(), s.basedir, dirs.GlobalRootDir); err != nil {
 			return err
 		}
 	}
@@ -1097,7 +1098,7 @@
 		logger.Noticef("Failed to remove %q: %v", currentSymlink, err)
 	}
 
-	currentDataSymlink := filepath.Join(snapDataDir, QualifiedName(s), "current")
+	currentDataSymlink := filepath.Join(dirs.SnapDataDir, QualifiedName(s), "current")
 	if err := os.Remove(currentDataSymlink); err != nil && !os.IsNotExist(err) {
 		logger.Noticef("Failed to remove %q: %v", currentDataSymlink, err)
 	}
@@ -1279,7 +1280,7 @@
 var timestampUpdater = helpers.UpdateTimestamp
 
 func updateAppArmorJSONTimestamp(fullName, thing, version string) error {
-	fn := filepath.Join(snapAppArmorDir, fmt.Sprintf("%s_%s_%s.json", fullName, thing, version))
+	fn := filepath.Join(dirs.SnapAppArmorDir, fmt.Sprintf("%s_%s_%s.json", fullName, thing, version))
 	return timestampUpdater(fn)
 }
 
@@ -1591,7 +1592,7 @@
 }
 
 func (s *RemoteSnapPart) downloadIcon(pbar progress.Meter) error {
-	if err := os.MkdirAll(snapIconsDir, 0755); err != nil {
+	if err := os.MkdirAll(dirs.SnapIconsDir, 0755); err != nil {
 		return err
 	}
 
@@ -1624,7 +1625,7 @@
 		return err
 	}
 
-	if err := os.MkdirAll(snapMetaDir, 0755); err != nil {
+	if err := os.MkdirAll(dirs.SnapMetaDir, 0755); err != nil {
 		return err
 	}
 
 
=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-09-15 20:24:56 +0000
+++ snappy/snapp_test.go	2015-09-29 11:44:13 +0000
@@ -31,6 +31,7 @@
 	"strings"
 
 	"launchpad.net/snappy/clickdeb"
+	"launchpad.net/snappy/dirs"
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/partition"
 	"launchpad.net/snappy/pkg"
@@ -58,18 +59,18 @@
 		return new(MockPartition)
 	}
 
-	SetRootDir(s.tempdir)
+	dirs.SetRootDir(s.tempdir)
 	policy.SecBase = filepath.Join(s.tempdir, "security")
-	os.MkdirAll(snapServicesDir, 0755)
-	os.MkdirAll(snapSeccompDir, 0755)
+	os.MkdirAll(dirs.SnapServicesDir, 0755)
+	os.MkdirAll(dirs.SnapSeccompDir, 0755)
 
 	release.Override(release.Release{Flavor: "core", Series: "15.04"})
 
-	clickSystemHooksDir = filepath.Join(s.tempdir, "/usr/share/click/hooks")
-	os.MkdirAll(clickSystemHooksDir, 0755)
+	dirs.ClickSystemHooksDir = filepath.Join(s.tempdir, "/usr/share/click/hooks")
+	os.MkdirAll(dirs.ClickSystemHooksDir, 0755)
 
 	// create a fake systemd environment
-	os.MkdirAll(filepath.Join(snapServicesDir, "multi-user.target.wants"), 0755)
+	os.MkdirAll(filepath.Join(dirs.SnapServicesDir, "multi-user.target.wants"), 0755)
 
 	// we may not have debsig-verify installed (and we don't need it
 	// for the unittests)
@@ -692,12 +693,12 @@
 	c.Assert(err, IsNil)
 	c.Assert(installed, HasLen, 1)
 
-	iconPath := filepath.Join(snapIconsDir, "foo.bar_1.0.png")
+	iconPath := filepath.Join(dirs.SnapIconsDir, "foo.bar_1.0.png")
 	c.Check(installed[0].Icon(), Equals, iconPath)
 	c.Check(installed[0].Origin(), Equals, "bar")
 	c.Check(installed[0].Description(), Equals, "this is a description")
 
-	_, err = os.Stat(filepath.Join(snapMetaDir, "foo.bar_1.0.manifest"))
+	_, err = os.Stat(filepath.Join(dirs.SnapMetaDir, "foo.bar_1.0.manifest"))
 	c.Check(err, IsNil)
 }
 
@@ -1118,11 +1119,11 @@
 	c.Assert(err, IsNil)
 	c.Assert(makeSnapActive(yamlPath), IsNil)
 
-	err = os.MkdirAll(snapMetaDir, 0755)
+	err = os.MkdirAll(dirs.SnapMetaDir, 0755)
 	c.Assert(err, IsNil)
 
 	data = "name: afoo\nalias: afoo\ndescription: something nice\ndownloadsize: 10\norigin: someplace"
-	err = ioutil.WriteFile(filepath.Join(snapMetaDir, "afoo_1.manifest"), []byte(data), 0644)
+	err = ioutil.WriteFile(filepath.Join(dirs.SnapMetaDir, "afoo_1.manifest"), []byte(data), 0644)
 	c.Assert(err, IsNil)
 
 	snaps, err := ListInstalled()
@@ -1192,14 +1193,14 @@
 }
 
 func (s *SnapTestSuite) TestRefreshDependentsSecurity(c *C) {
-	oldDir := snapAppArmorDir
+	oldDir := dirs.SnapAppArmorDir
 	defer func() {
-		snapAppArmorDir = oldDir
+		dirs.SnapAppArmorDir = oldDir
 		timestampUpdater = helpers.UpdateTimestamp
 	}()
 	touched := []string{}
-	snapAppArmorDir = c.MkDir()
-	fn := filepath.Join(snapAppArmorDir, "foo."+testOrigin+"_hello_1.0.json")
+	dirs.SnapAppArmorDir = c.MkDir()
+	fn := filepath.Join(dirs.SnapAppArmorDir, "foo."+testOrigin+"_hello_1.0.json")
 	c.Assert(os.Symlink(fn, fn), IsNil)
 	timestampUpdater = func(s string) error {
 		touched = append(touched, s)
@@ -1457,18 +1458,18 @@
 	m, err := parsePackageYamlData(hardwareYaml, false)
 	c.Assert(err, IsNil)
 
-	snapUdevRulesDir = c.MkDir()
+	dirs.SnapUdevRulesDir = c.MkDir()
 	writeOemHardwareUdevRules(m)
 
-	c.Assert(helpers.FileExists(filepath.Join(snapUdevRulesDir, "80-snappy_oem-foo_device-hive-iot-hal.rules")), Equals, true)
+	c.Assert(helpers.FileExists(filepath.Join(dirs.SnapUdevRulesDir, "80-snappy_oem-foo_device-hive-iot-hal.rules")), Equals, true)
 }
 
 func (s *SnapTestSuite) TestWriteHardwareUdevCleanup(c *C) {
 	m, err := parsePackageYamlData(hardwareYaml, false)
 	c.Assert(err, IsNil)
 
-	snapUdevRulesDir = c.MkDir()
-	udevRulesFile := filepath.Join(snapUdevRulesDir, "80-snappy_oem-foo_device-hive-iot-hal.rules")
+	dirs.SnapUdevRulesDir = c.MkDir()
+	udevRulesFile := filepath.Join(dirs.SnapUdevRulesDir, "80-snappy_oem-foo_device-hive-iot-hal.rules")
 	c.Assert(ioutil.WriteFile(udevRulesFile, nil, 0644), Equals, nil)
 	cleanupOemHardwareUdevRules(m)