Set paths and global variables to the universal scope

README.md

@@ -8,8 +8,8 @@ Switch environment according to current working directory. Heavily inspired by t
 
 Configure any combination of the following in a simple YAML file:
 - ssh identities
-- paths (to append to `$fish_user_paths`)
-- global variables
+- paths (to append to `$fish_user_paths`, which then becomes a _universal_ variable)
+- global (= universal) variables
 - git user email address
 
 Whenever you visit a directory containing a `.cuttlefish.yaml` file, its configuration is applied to your environment.
@@ -79,6 +79,8 @@ make build
 
 ### Test
 
+**Note:** This requires a running Docker daemon.
+
 ```
 make test
 ```

globals/globals.go

@@ -11,14 +11,14 @@ func Set(additions map[string]string, deletions []string) []string {
 
 	for _, key := range deletions {
 		if err := common.Validate(key); err == nil {
-			cmds = append(cmds, fmt.Sprintf("set --global --erase %v", key))
+			cmds = append(cmds, fmt.Sprintf("set --universal --erase %v", key))
 		}
 	}
 
 	for key, value := range additions {
 		if err := common.Validate(key); err == nil {
 			if err := common.Validate(value); err == nil {
-				cmds = append(cmds, fmt.Sprintf("set --global --export %v %v", key, value))
+				cmds = append(cmds, fmt.Sprintf("set --universal --export %v %v", key, value))
 			}
 		}
 	}

paths/paths.go

@@ -20,7 +20,7 @@ func Set(additions []string, deletions []string) []string {
 
 	for _, path := range additions {
 		if err := common.Validate(path); err == nil {
-			cmds = append(cmds, fmt.Sprintf("contains %v $fish_user_paths; or set --global --export --append fish_user_paths %v", path, path))
+			cmds = append(cmds, fmt.Sprintf("contains %v $fish_user_paths; or set --universal --append fish_user_paths %v", path, path))
 		}
 	}