@@ -19,6 +19,7 @@ package helper
1919 */
2020
2121import (
22+ "embed"
2223 "fmt"
2324 "os"
2425 "path"
@@ -27,98 +28,99 @@ import (
2728 "github.com/synfinatic/aws-sso-cli/internal/utils"
2829)
2930
30- import _ "embed"
31+ //go:embed bash_profile.sh zshrc.sh aws-sso.fish
32+ var embedFiles embed.FS
3133
32- //go:embed bash_profile.sh
33- var BASH_PROFILE string
34-
35- //go:embed zshrc.sh
36- var ZSH_SCRIPT string
37-
38- //go:embed aws-sso.fish
39- var FISH_SCRIPT string
34+ type fileMap struct {
35+ Key string
36+ Path string
37+ }
4038
4139// map of shells to their file we edit by default
42- var SHELL_SCRIPTS = map [string ]string {
43- "bash" : "~/.bash_profile" ,
44- "zsh" : "~/.zshrc" ,
45- "fish" : getFishScript (),
40+ var SHELL_SCRIPTS = map [string ]fileMap {
41+ "bash" : {
42+ Key : "bash_profile.sh" ,
43+ Path : "~/.bash_profile" ,
44+ },
45+ "zsh" : {
46+ Key : "zshrc.sh" ,
47+ Path : "~/.zshrc" ,
48+ },
49+ "fish" : {
50+ Key : "aws-sso.fish" ,
51+ Path : getFishScript (),
52+ },
4653}
4754
4855// ConfigFiles returns a list of all the config files we might edit
4956func ConfigFiles () []string {
5057 ret := []string {}
5158
5259 for _ , v := range SHELL_SCRIPTS {
53- ret = append (ret , utils .GetHomePath (v ))
60+ ret = append (ret , utils .GetHomePath (v . Path ))
5461 }
5562 return ret
5663}
5764
58- // InstallHelper installs any helper code into our shell startup script(s)
59- func InstallHelper (shell , script string ) error {
65+ // getScript takes a shell and returns the contents & path to the shell script
66+ func getScript (shell string ) ([] byte , string , error ) {
6067 var err error
68+ var bytes []byte
69+ var shellFile fileMap
6170 var ok bool
62- var shellFile string
6371
6472 if shell == "" {
6573 if shell , err = detectShell (); err != nil {
66- return err
74+ return bytes , "" , err
6775 }
6876 }
77+ log .Debugf ("using %s as our shell" , shell )
6978
70- if script == "" {
71- if shellFile , ok = SHELL_SCRIPTS [shell ]; ! ok {
72- return fmt .Errorf ("unsupported shell: %s" , shell )
73- }
74- script = utils .GetHomePath (shellFile )
79+ if shellFile , ok = SHELL_SCRIPTS [shell ]; ! ok {
80+ return bytes , "" , fmt .Errorf ("unsupported shell: %s" , shell )
7581 }
7682
77- switch shell {
78- case "bash" :
79- err = installConfigFile (script , BASH_PROFILE )
80- case "zsh" :
81- err = installConfigFile (script , ZSH_SCRIPT )
82- case "fish" :
83- err = installConfigFile (script , FISH_SCRIPT )
84- default :
85- err = fmt .Errorf ("unsupported shell: %s" , shell )
83+ path := utils .GetHomePath (shellFile .Path )
84+ bytes , err = embedFiles .ReadFile (shellFile .Key )
85+ if err != nil {
86+ return bytes , "" , err
8687 }
87-
88- return err
88+ return bytes , path , nil
8989}
9090
91- // UninstallHelper removes any helper code from our shell startup script(s)
92- func UninstallHelper (shell , script string ) error {
93- var err error
94- var ok bool
95- var shellFile string
96-
97- if shell == "" {
98- if shell , err = detectShell (); err != nil {
99- return err
100- }
91+ // InstallHelper installs any helper code into our shell startup script(s)
92+ func InstallHelper (shell string , path string ) error {
93+ c , defaultPath , err := getScript (shell )
94+ if err != nil {
95+ return err
10196 }
10297
103- if script == "" {
104- if shellFile , ok = SHELL_SCRIPTS [shell ]; ! ok {
105- return fmt .Errorf ("unsupported shell: %s" , shell )
106- }
107- script = utils .GetHomePath (shellFile )
98+ if path == "" {
99+ err = installConfigFile (defaultPath , c )
100+ } else {
101+ err = installConfigFile (path , c )
108102 }
109103
110- switch shell {
111- case "bash" :
112- err = uninstallConfigFile (script , BASH_PROFILE )
113- default :
114- err = fmt .Errorf ("unsupported shell: %s" , shell )
104+ return err
105+ }
106+
107+ // UninstallHelper removes any helper code from our shell startup script(s)
108+ func UninstallHelper (shell string , path string ) error {
109+ c , defaultPath , err := getScript (shell )
110+ if err != nil {
111+ return err
115112 }
116113
114+ if path == "" {
115+ err = uninstallConfigFile (defaultPath , c )
116+ } else {
117+ err = uninstallConfigFile (path , c )
118+ }
117119 return err
118120}
119121
120122// installConfigFile adds our blob to the given file
121- func installConfigFile (path , contents string ) error {
123+ func installConfigFile (path string , contents [] byte ) error {
122124 var err error
123125 var exec string
124126 var fe * utils.FileEdit
@@ -131,7 +133,7 @@ func installConfigFile(path, contents string) error {
131133 "Executable" : exec ,
132134 }
133135
134- if fe , err = utils .NewFileEdit (BASH_PROFILE , args ); err != nil {
136+ if fe , err = utils .NewFileEdit (string ( contents ) , args ); err != nil {
135137 return err
136138 }
137139
@@ -143,7 +145,7 @@ func installConfigFile(path, contents string) error {
143145}
144146
145147// uninstallConfigFile removes our blob from the given file
146- func uninstallConfigFile (path , contents string ) error {
148+ func uninstallConfigFile (path string , contents [] byte ) error {
147149 var err error
148150 var fe * utils.FileEdit
149151
@@ -168,6 +170,7 @@ func detectShell() (string, error) {
168170 }
169171
170172 _ , shell := path .Split (shellPath )
173+ log .Debugf ("detected configured shell as: %s" , shell )
171174 return shell , nil
172175}
173176
0 commit comments