Skip to content

Commit 0ba1f41

Browse files
committed
more robust with spaces
1 parent 487fd9d commit 0ba1f41

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

+stdlib/+sys/disk_available.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
dl = extractBefore(stdlib.absolute(p), 2);
99
cmd = "pwsh -c (Get-Volume -DriveLetter " + dl + ").SizeRemaining";
1010
elseif ismac()
11-
cmd = "df -k " + p + " | awk 'NR==2 {print $4*1024}'";
11+
cmd = sprintf('df -k "%s" | awk ''NR==2 {print $4*1024}''', p);
1212
else
13-
cmd = "df -B1 " + p + " | awk 'NR==2 {print $4}'";
13+
cmd = sprintf('df -B1 "%s" | awk ''NR==2 {print $4}''', p);
1414
end
1515

1616
[s, t] = system(cmd);

+stdlib/+sys/disk_capacity.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
dl = extractBefore(stdlib.absolute(p), 2);
99
cmd = "pwsh -c (Get-Volume -DriveLetter " + dl + ").Size";
1010
elseif ismac()
11-
cmd = "df -k " + p + " | awk 'NR==2 {print $2*1024}'";
11+
cmd = sprintf('df -k "%s" | awk ''NR==2 {print $2*1024}''', p);
1212
else
13-
cmd = "df -B1 " + p + " | awk 'NR==2 {print $2}'";
13+
cmd = sprintf('df -B1 "%s" | awk ''NR==2 {print $2}''', p);
1414
end
1515

1616
[s, t] = system(cmd);

+stdlib/+sys/is_removable.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
drive = stdlib.root_name(filepath);
77
cmd1 = strcat('wmic logicaldisk where "DeviceID=''', drive, '''" get DriveType');
88
else
9-
cmd1 = "df " + filepath + " | tail -n 1 | awk '{print $1}'";
9+
cmd1 = sprintf('df "%s" | tail -n 1 | awk ''{print $1}''', filepath);
1010
end
1111
[s1, m1] = system(cmd1);
1212
if s1 ~= 0
13+
warning('stdlib:is_removable:OSError', '%s', m1)
1314
return
1415
end
1516

0 commit comments

Comments
 (0)