Skip to content

Commit 7bbcfd1

Browse files
authored
Merge pull request #573 from intersystems/357-dont-suggest-windows-style-paths-on-linux-as-defaults
Remove windows style paths as defaults
2 parents 9d281f3 + f4e1d20 commit 7bbcfd1

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3737
- Removed inaccurate placeholder text for commit message in UI (#406)
3838
- Initialize repo in settings page now uses entered repo (#486)
3939
- Report error more clearly if you try to create a branch with an invalid name (#534)
40+
- Don't default to WINDOWS style paths (#357)
4041

4142
## [2.6.0] - 2024-10-07
4243

cls/SourceControl/Git/Utils.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $Replace(..#Storage,"^SYS","^%SYS")
2424
/// Returns root temp folder
2525
ClassMethod DefaultTemp() As %String
2626
{
27-
set defaultTemp = "c:\temp\"
27+
set defaultTemp = ##class(%File).Construct($System.Util.ManagerDirectory(),"repo/"_$Namespace)
2828
try {
2929
set defaultTemp = $Get(@..%SYSNamespaceStorage()@("%defaultTemp"), defaultTemp)
3030
} catch e {

csp/gitprojectsettings.csp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,11 @@ body {
250250
} else {
251251
set class = "form-control"
252252
}
253+
set placeholder = $Select($system.Version.GetOS()="Windows":"(e.g. C:\someproj\)",
254+
1:"(e.g., /someproj/)")
253255
</server>
254256
<div class="col-sm-7">
255-
<input type="text" class="#(class)#" id="namespaceTemp" name="namespaceTemp" value='#(..EscapeHTML(settings.namespaceTemp))#' placeholder="e.g. C:\someproj\"/>
257+
<input type="text" class="#(class)#" id="namespaceTemp" name="namespaceTemp" value='#(..EscapeHTML(settings.namespaceTemp))#' placeholder=#(placeholder)#/>
256258
</div>
257259
</div>
258260
<server>
@@ -290,8 +292,10 @@ body {
290292
"File not found - generate a new key pair?"_
291293
"</button>"
292294
}
295+
set placeholder = $Select($system.Version.GetOS()="Windows":"(e.g. C:\Users\ExampleUser\.ssh\id_rsa)",
296+
1:"(e.g., /home/user/.ssh/id_rsa)")
293297
</server>
294-
<input type="text" class="#(class)#" id="privateKeyFile" name="privateKeyFile" value='#(..EscapeHTML(settings.privateKeyFile))#' placeholder="C:\Users\ExampleUser\.ssh\id_rsa"/>
298+
<input type="text" class="#(class)#" id="privateKeyFile" name="privateKeyFile" value='#(..EscapeHTML(settings.privateKeyFile))#' placeholder=#(placeholder)#/>
295299
<div class = "#(divClass)#">
296300
#(feedbackText)#
297301
<pre id="sshOutput"></pre>

0 commit comments

Comments
 (0)