diff --git a/cmd/docker-setup/init.go b/cmd/docker-setup/init.go index 375e70268..805204223 100644 --- a/cmd/docker-setup/init.go +++ b/cmd/docker-setup/init.go @@ -30,6 +30,7 @@ var registryImagePrefix = registry + "/" + repository + toolSeparator var tools tool.Tools var emojiTool = "\U0001F528" +var emojiRun = "\U0001FE0F" func directoryExists(directory string) bool { log.Tracef("Checking if directory %s exists", directory) diff --git a/cmd/docker-setup/postinstall.go b/cmd/docker-setup/postinstall.go index 10408cbc8..301ea488f 100644 --- a/cmd/docker-setup/postinstall.go +++ b/cmd/docker-setup/postinstall.go @@ -16,12 +16,10 @@ func initPostinstallCmd() { } var postinstallCmd = &cobra.Command{ - Use: "install [tool...]", - Aliases: []string{"i"}, - Short: "Install tools", - Long: header + "\nInstall and update tools", - Args: cobra.OnlyValidArgs, - ValidArgs: tools.GetNames(), + Use: "postinstall", + Short: "Run postinstall for tools", + Long: header + "\nRun postinstall for tools", + Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { return postinstall() }, @@ -50,13 +48,14 @@ func postinstall() error { if !file.IsDir() && strings.HasSuffix(file.Name(), ".sh") { fmt.Printf("Running post_install script %s\n", file.Name()) - log.Tracef("Running post_install script %s", "/"+libDirectory+"/post_install/"+file.Name()) + log.Tracef("%s Running post_install script %s", emojiRun, "/"+libDirectory+"/post_install/"+file.Name()) cmd := exec.Command("/bin/bash", "/"+libDirectory+"/post_install/"+file.Name()) cmd.Env = append(os.Environ(), "prefix=", "target=/"+target, "arch="+arch, "alt_arch="+altArch, + "docker_setup_contrib=/"+libDirectory+"/contrib", ) output, err := cmd.CombinedOutput() if err != nil {