Skip to content

Commit

Permalink
Merge pull request saltstack#45246 from twangboy/win_fix_installer_typos
Browse files Browse the repository at this point in the history
Fix a few minor typos in the installer script
  • Loading branch information
Nicole Thomas authored Jan 3, 2018
2 parents 253b818 + 1f2658b commit 83452f7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/windows/installer/Salt-Minion-Setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ Function BackupExistingConfig
# Backup the minion config
Rename "$INSTDIR\conf\minion" "$INSTDIR\conf\minion-${TIME_STAMP}.bak"
IfFileExists "$INSTDIR\conf\minion.d" 0 +2
Rename "$INSTDIR\conf\minion.d" "$INSTDIR\conf\minion.d-{TIME_STAMP}$.bak"
Rename "$INSTDIR\conf\minion.d" "$INSTDIR\conf\minion.d-${TIME_STAMP}.bak"

${EndIf}

Expand Down Expand Up @@ -1418,7 +1418,7 @@ Function parseCommandLineSwitches
FileWrite $0 "$\t$\t$\tdefault config$\n"
FileWrite $0 "$\n"
FileWrite $0 "$\t$\t$\tAny existing config will be backed up by appending$\n"
FileWrite $0 "$\t$\t$\ta timestamp and a .bak$ extension. That includes\n"
FileWrite $0 "$\t$\t$\ta timestamp and a .bak extension. That includes\n"
FileWrite $0 "$\t$\t$\tthe minion file and the minion.d directory$\n"
FileWrite $0 "$\n"
FileWrite $0 "/custom-config=$\t$\tA string value specifying the name of a custom config$\n"
Expand All @@ -1428,7 +1428,7 @@ Function parseCommandLineSwitches
FileWrite $0 "$\t$\t$\tcustom config$\n"
FileWrite $0 "$\n"
FileWrite $0 "$\t$\t$\tAny existing config will be backed up by appending$\n"
FileWrite $0 "$\t$\t$\ta timestamp and a .bak$ extension. That includes\n"
FileWrite $0 "$\t$\t$\ta timestamp and a .bak extension. That includes\n"
FileWrite $0 "$\t$\t$\tthe minion file and the minion.d directory$\n"
FileWrite $0 "$\n"
FileWrite $0 "/S$\t$\t$\tInstall Salt silently$\n"
Expand Down

0 comments on commit 83452f7

Please sign in to comment.