Fix filemarker creation process, update error message on uninstall

internal/pkg/agent/application/info/agent_metadata.go

@@ -169,7 +169,7 @@ func (i *AgentInfo) ECSMetadata(l *logger.Logger) (*ECSMeta, error) {
 				BuildOriginal: release.Info().String(),
 				// only upgradeable if running from Agent installer and running under the
 				// control of the system supervisor (or built specifically with upgrading enabled)
-				Upgradeable: release.Upgradeable() || (paths.RunningInstalled() && RunningUnderSupervisor()),
+				Upgradeable: release.Upgradeable() || (paths.InstallMarkerExists() && RunningUnderSupervisor()),
 				LogLevel:    i.LogLevel(),
 			},
 		},

internal/pkg/agent/application/paths/common.go

@@ -323,8 +323,8 @@ func TopBinaryPath() string {
 	return filepath.Join(Top(), BinaryName)
 }
 
-// RunningInstalled returns true when executing Agent is the installed Agent.
-func RunningInstalled() bool {
+// InstallMarkerExists returns true if the .installed file marker exists relative to the top path
+func InstallMarkerExists() bool {
 	// Check if install marker created by `elastic-agent install` exists
 	markerFilePath := filepath.Join(Top(), MarkerFileName)
 	if _, err := os.Stat(markerFilePath); err != nil {

internal/pkg/agent/application/paths/paths_windows.go

@@ -48,7 +48,7 @@ func AgentVaultPath() string {
 
 func initialControlSocketPath(topPath string) string {
 	// when installed the control address is fixed
-	if RunningInstalled() {
+	if InstallMarkerExists() {
 		return WindowsControlSocketInstalledPath
 	}
 	return ControlSocketFromPath(runtime.GOOS, topPath)
@@ -57,11 +57,11 @@ func initialControlSocketPath(topPath string) string {
 // ResolveControlSocket updates the control socket path.
 //
 // Called during the upgrade process from pre-8.8 versions. In pre-8.8 versions the
-// RunningInstalled will always be false, even when it is an installed version. Once
+// InstallMarkerExists will always be false, even when it is an installed version. Once
 // that is fixed from the upgrade process the control socket path needs to be updated.
 func ResolveControlSocket() {
 	currentPath := ControlSocket()
-	if currentPath == ControlSocketFromPath(runtime.GOOS, topPath) && RunningInstalled() {
+	if currentPath == ControlSocketFromPath(runtime.GOOS, topPath) && InstallMarkerExists() {
 		// path is not correct being that it's installed
 		// reset the control socket path to be the installed path
 		SetControlSocket(WindowsControlSocketInstalledPath)

internal/pkg/agent/application/upgrade/upgrade.go

@@ -63,7 +63,7 @@ type Upgrader struct {
 func IsUpgradeable() bool {
 	// only upgradeable if running from Agent installer and running under the
 	// control of the system supervisor (or built specifically with upgrading enabled)
-	return release.Upgradeable() || (paths.RunningInstalled() && info.RunningUnderSupervisor())
+	return release.Upgradeable() || (paths.InstallMarkerExists() && info.RunningUnderSupervisor())
 }
 
 // NewUpgrader creates an upgrader which is capable of performing upgrade operation

internal/pkg/agent/cmd/install.go

@@ -211,7 +211,7 @@ func installCmd(streams *cli.IOStreams, cmd *cobra.Command) error {
 			return
 		}
 		oLogs := logp.ObserverLogs().TakeAll()
-		fmt.Fprintf(os.Stderr, "Error uninstalling.  Printing logs\n")
+		fmt.Fprintf(os.Stderr, "Error installing.  Printing logs\n")
 		for _, oLog := range oLogs {
 			fmt.Fprintf(os.Stderr, "%v\n", oLog.Entry)
 		}

internal/pkg/agent/cmd/run.go

@@ -293,7 +293,7 @@ func runElasticAgent(ctx context.Context, cancel context.CancelFunc, override cf
 	// option during installation
 	//
 	// Windows `paths.ControlSocketRunSymlink` is `""` so this is always skipped on Windows.
-	if isRoot && paths.RunningInstalled() && paths.ControlSocketRunSymlink != "" {
+	if isRoot && paths.InstallMarkerExists() && paths.ControlSocketRunSymlink != "" {
 		socketPath := strings.TrimPrefix(paths.ControlSocket(), "unix://")
 		socketLog := controlLog.With("path", socketPath).With("link", paths.ControlSocketRunSymlink)
 		// ensure it doesn't exist before creating the symlink
@@ -660,7 +660,7 @@ func ensureInstallMarkerPresent() error {
 
 	// Only an installed Elastic Agent can be self-upgraded. So, if the
 	// installation marker file is already present, we're all set.
-	if paths.RunningInstalled() {
+	if paths.InstallMarkerExists() {
 		return nil
 	}
 

internal/pkg/agent/cmd/uninstall.go

@@ -54,8 +54,9 @@ func uninstallCmd(streams *cli.IOStreams, cmd *cobra.Command) error {
 	if status == install.NotInstalled {
 		return fmt.Errorf("not installed")
 	}
-	if status == install.Installed && !paths.RunningInstalled() {
-		return fmt.Errorf("can only be uninstalled by executing the installed Elastic Agent at: %s", install.ExecutablePath(paths.Top()))
+
+	if status == install.Installed && !paths.InstallMarkerExists() {
+		return fmt.Errorf("cannot find %s file relative to running elastic agent; agent uninstall should be run from %s, or the install may be corrupt", paths.MarkerFileName, install.ExecutablePath(paths.Top()))
 	}
 
 	force, _ := cmd.Flags().GetBool("force")

internal/pkg/agent/install/install.go

@@ -130,6 +130,7 @@ func Install(cfgFile, topPath string, unprivileged bool, log *logp.Logger, pt *p
 		Sync:         true,
 		NumOfWorkers: int64(copyConcurrency),
 	})
+
 	if err != nil {
 		pt.Describe("Error copying files")
 		return utils.FileOwner{}, errors.New(
@@ -140,6 +141,11 @@ func Install(cfgFile, topPath string, unprivileged bool, log *logp.Logger, pt *p
 	}
 	pt.Describe("Successfully copied files")
 
+	// create the install marker
+	if err := CreateInstallMarker(topPath, ownership); err != nil {
+		return utils.FileOwner{}, fmt.Errorf("failed to create install marker: %w", err)
+	}
+
 	// place shell wrapper, if present on platform
 	if paths.ShellWrapperPath != "" {
 		pathDir := filepath.Dir(paths.ShellWrapperPath)
@@ -186,11 +192,6 @@ func Install(cfgFile, topPath string, unprivileged bool, log *logp.Logger, pt *p
 		}
 	}
 
-	// create the install marker
-	if err := CreateInstallMarker(topPath, ownership); err != nil {
-		return utils.FileOwner{}, fmt.Errorf("failed to create install marker: %w", err)
-	}
-
 	// post install (per platform)
 	err = postInstall(topPath)
 	if err != nil {