Installation fixes

master v3.0.2
Šimon Let 3 years ago
parent 611198e9d5
commit a6e4c85d31
  1. 1
      cmd/control/cmd/update.go
  2. 2
      internal/device/device.go
  3. 2
      scripts/install.sh

@ -23,6 +23,7 @@ var updateCmd = &cobra.Command{
execArgs = append(execArgs, "--beta") execArgs = append(execArgs, "--beta")
} }
execCmd := exec.Command("bash", execArgs...) execCmd := exec.Command("bash", execArgs...)
execCmd.Stdin = os.Stdin
execCmd.Stdout = os.Stdout execCmd.Stdout = os.Stdout
execCmd.Stderr = os.Stderr execCmd.Stderr = os.Stderr
err = execCmd.Run() err = execCmd.Run()

@ -130,7 +130,7 @@ func promptForName(out *output.Output, fpath string) (string, error) {
fmt.Printf("\nChoose a short name for this device (default: '%s'): ", hostStub) fmt.Printf("\nChoose a short name for this device (default: '%s'): ", hostStub)
input, err := reader.ReadString('\n') input, err := reader.ReadString('\n')
name := strings.TrimRight(input, "\n") name := strings.TrimRight(input, "\n")
if err != nil { if err != nil && err.Error() != "EOF" {
return "", fmt.Errorf("reader error: %w", err) return "", fmt.Errorf("reader error: %w", err)
} }
if name == "" { if name == "" {

@ -88,7 +88,7 @@ if [ -z "${__RESH_VERSION-}" ]; then
# But don't output anything # But don't output anything
./scripts/resh-daemon-stop.sh -q ||: ./scripts/resh-daemon-stop.sh -q ||:
else else
./scripts/resh-daemon-stop.sh ./scripts/resh-daemon-stop.sh ||:
fi fi
echo "Installing ..." echo "Installing ..."

Loading…
Cancel
Save