add link ocmmand for adding to PATH · aly.codes/appherder@6625f36

+35

cmd/appherder/cli.go

··· 27 27 newInstallCommand(a), 28 28 newUninstallCommand(a), 29 29 newListCommand(a), 30 + newLinkCommand(a), 31 + newUnlinkCommand(a), 30 32 newSyncCommand(a), 31 33 newMigrateCommand(a), 32 34 newUpgradeCommand(a), ··· 213 215 } 214 216 cmd.Flags().BoolVar(&off, "off", false, offHelp) 215 217 return cmd 218 + } 219 + 220 + func newLinkCommand(a appherder.App) *cobra.Command { 221 + return &cobra.Command{ 222 + Use: "link APP", 223 + Short: "Add an installed AppImage to PATH", 224 + Long: "Creates a symlink in ~/.local/bin so the AppImage can be invoked by its name\n" + 225 + "from a terminal. The app must already be installed in ~/AppImages.", 226 + Args: cobra.ExactArgs(1), 227 + RunE: func(cmd *cobra.Command, args []string) error { 228 + if err := a.Link(args[0]); err != nil { 229 + return err 230 + } 231 + fmt.Fprintf(cmd.OutOrStdout(), "linked %s\n", appherder.NormalizeAppName(args[0])) 232 + return nil 233 + }, 234 + } 235 + } 236 + 237 + func newUnlinkCommand(a appherder.App) *cobra.Command { 238 + return &cobra.Command{ 239 + Use: "unlink APP", 240 + Short: "Remove an AppImage symlink from PATH", 241 + Long: "Removes the ~/.local/bin symlink created by `appherder link`.", 242 + Args: cobra.ExactArgs(1), 243 + RunE: func(cmd *cobra.Command, args []string) error { 244 + if err := a.Unlink(args[0]); err != nil { 245 + return err 246 + } 247 + fmt.Fprintf(cmd.OutOrStdout(), "unlinked %s\n", appherder.NormalizeAppName(args[0])) 248 + return nil 249 + }, 250 + } 216 251 } 217 252 218 253 func newAutosyncCommand() *cobra.Command {

+48

internal/appherder/link.go

··· 1 + package appherder 2 + 3 + import ( 4 + "fmt" 5 + "os" 6 + "path/filepath" 7 + ) 8 + 9 + func (a App) localBinDir() string { 10 + return filepath.Join(filepath.Dir(filepath.Dir(a.applicationsDir)), "bin") 11 + } 12 + 13 + func (a App) linkPath(appName string) string { 14 + return filepath.Join(a.localBinDir(), appName) 15 + } 16 + 17 + func (a App) appImagePath(appName string) string { 18 + return filepath.Join(a.appimagesDir, appName+".appimage") 19 + } 20 + 21 + func (a App) Link(appName string) error { 22 + appName = NormalizeAppName(appName) 23 + src := a.appImagePath(appName) 24 + if _, err := os.Stat(src); err != nil { 25 + return fmt.Errorf("%s is not installed", appName) 26 + } 27 + binDir := a.localBinDir() 28 + if err := os.MkdirAll(binDir, 0o755); err != nil { 29 + return fmt.Errorf("create %s: %w", binDir, err) 30 + } 31 + dst := a.linkPath(appName) 32 + if err := os.Remove(dst); err != nil && !os.IsNotExist(err) { 33 + return fmt.Errorf("remove existing link %s: %w", dst, err) 34 + } 35 + if err := os.Symlink(src, dst); err != nil { 36 + return fmt.Errorf("link %s -> %s: %w", dst, src, err) 37 + } 38 + return nil 39 + } 40 + 41 + func (a App) Unlink(appName string) error { 42 + appName = NormalizeAppName(appName) 43 + dst := a.linkPath(appName) 44 + if err := os.Remove(dst); err != nil { 45 + return fmt.Errorf("remove link %s: %w", dst, err) 46 + } 47 + return nil 48 + }

+114

internal/appherder/link_test.go

··· 1 + package appherder 2 + 3 + import ( 4 + "os" 5 + "path/filepath" 6 + "testing" 7 + ) 8 + 9 + func TestLink(t *testing.T) { 10 + app, home := newTestApp(t) 11 + mustWrite(t, filepath.Join(home, "AppImages", "foo.appimage"), []byte("fake appimage")) 12 + 13 + if err := app.Link("foo"); err != nil { 14 + t.Fatalf("Link: %v", err) 15 + } 16 + 17 + link := filepath.Join(home, ".local", "bin", "foo") 18 + target, err := os.Readlink(link) 19 + if err != nil { 20 + t.Fatalf("readlink: %v", err) 21 + } 22 + want := filepath.Join(home, "AppImages", "foo.appimage") 23 + if target != want { 24 + t.Errorf("link target = %q, want %q", target, want) 25 + } 26 + } 27 + 28 + func TestLinkUninstalled(t *testing.T) { 29 + app, _ := newTestApp(t) 30 + err := app.Link("nope") 31 + if err == nil { 32 + t.Fatal("expected error linking uninstalled app") 33 + } 34 + } 35 + 36 + func TestLinkNormalizesName(t *testing.T) { 37 + app, home := newTestApp(t) 38 + mustWrite(t, filepath.Join(home, "AppImages", "foo.appimage"), []byte("x")) 39 + 40 + if err := app.Link("foo.appimage"); err != nil { 41 + t.Fatalf("Link: %v", err) 42 + } 43 + 44 + link := filepath.Join(home, ".local", "bin", "foo") 45 + target, err := os.Readlink(link) 46 + if err != nil { 47 + t.Fatalf("readlink: %v", err) 48 + } 49 + if target != filepath.Join(home, "AppImages", "foo.appimage") { 50 + t.Errorf("unexpected target: %s", target) 51 + } 52 + } 53 + 54 + func TestUnlink(t *testing.T) { 55 + app, home := newTestApp(t) 56 + mustWrite(t, filepath.Join(home, "AppImages", "foo.appimage"), []byte("x")) 57 + binDir := filepath.Join(home, ".local", "bin") 58 + mustMkdir(t, binDir) 59 + mustSymlink(t, filepath.Join(home, "AppImages", "foo.appimage"), filepath.Join(binDir, "foo")) 60 + 61 + if err := app.Unlink("foo"); err != nil { 62 + t.Fatalf("Unlink: %v", err) 63 + } 64 + if _, err := os.Readlink(filepath.Join(binDir, "foo")); !os.IsNotExist(err) { 65 + t.Fatal("link still exists after unlink") 66 + } 67 + } 68 + 69 + func TestUnlinkNotLinked(t *testing.T) { 70 + app, _ := newTestApp(t) 71 + err := app.Unlink("nope") 72 + if err == nil { 73 + t.Fatal("expected error unlinking nonexistent link") 74 + } 75 + } 76 + 77 + func TestUnlinkNormalizesName(t *testing.T) { 78 + app, home := newTestApp(t) 79 + mustWrite(t, filepath.Join(home, "AppImages", "foo.appimage"), []byte("x")) 80 + binDir := filepath.Join(home, ".local", "bin") 81 + mustMkdir(t, binDir) 82 + mustSymlink(t, filepath.Join(home, "AppImages", "foo.appimage"), filepath.Join(binDir, "foo")) 83 + 84 + if err := app.Unlink("foo.appimage"); err != nil { 85 + t.Fatalf("Unlink: %v", err) 86 + } 87 + if _, err := os.Readlink(filepath.Join(binDir, "foo")); !os.IsNotExist(err) { 88 + t.Fatal("link still exists after unlink") 89 + } 90 + } 91 + 92 + func mustWrite(t *testing.T, path string, data []byte) { 93 + t.Helper() 94 + if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { 95 + t.Fatal(err) 96 + } 97 + if err := os.WriteFile(path, data, 0o644); err != nil { 98 + t.Fatal(err) 99 + } 100 + } 101 + 102 + func mustMkdir(t *testing.T, path string) { 103 + t.Helper() 104 + if err := os.MkdirAll(path, 0o755); err != nil { 105 + t.Fatal(err) 106 + } 107 + } 108 + 109 + func mustSymlink(t *testing.T, target, link string) { 110 + t.Helper() 111 + if err := os.Symlink(target, link); err != nil { 112 + t.Fatal(err) 113 + } 114 + }

Configure Feed

Configure Feed