is_removable: make work on Windows with USB drives too

Author: scivision

+stdlib/+sys/isRemovableDrive.ps1

@@ -0,0 +1,39 @@
+function IsRemovableDrive {
+# Detect USB flash drive or CD / DVD drives
+# If the DVD drive is empty (no media), returns false
+  [CmdletBinding()]
+  param (
+    # Expects only a single letter (e.g., 'D' or 'E').
+    [Parameter(Mandatory=$true, Position=0)]
+    [ValidatePattern('^[a-zA-Z]$')]
+    [string]$DriveLetter
+  )
+
+  # Format the letter into the 'D:' format.
+  $deviceID = "${DriveLetter}:"
+
+  try {
+
+    $logicalDisk = Get-CimInstance -ClassName Win32_LogicalDisk -Filter "DeviceID='$deviceID'" -ErrorAction Stop
+
+    # Write-Host $logicalDisk
+
+    if ($logicalDisk.DriveType -eq 5) { return $true }  # CD-ROM drive
+
+    $partition = $logicalDisk |
+      Get-CimAssociatedInstance -Association Win32_LogicalDiskToPartition
+
+    # Write-Host $partition
+
+    $physicalDisk = $partition |
+      Get-CimAssociatedInstance -Association Win32_DiskDriveToDiskPartition -ErrorAction Stop
+
+    # Write-Host $physicalDisk
+    # Write-Host "InterfaceType: $($physicalDisk.InterfaceType)"
+
+    return ($null -ne $physicalDisk) -and ($physicalDisk.InterfaceType -eq 'USB')
+  }
+  catch {
+    return $false
+  }
+}

+stdlib/+sys/is_removable.m

@@ -1,10 +1,20 @@
+%% SYS.IS_REMOVABLE
+
 function y = is_removable(filepath)
 
 y = false;
 
 if ispc()
-  drive = stdlib.root_name(filepath);
-  cmd1 = sprintf('wmic logicaldisk where "DeviceID=''%s''" get DriveType', drive);
+  r = stdlib.root_name(filepath);
+  if ~strlength(r), return, end
+  r = extractBefore(r, 2);
+
+  psFile = fullfile(fileparts(mfilename('fullpath')), "isRemovableDrive.ps1");
+  mustBeFile(psFile)
+
+  psCmd = sprintf(". '%s'; IsRemovableDrive -DriveLetter '%s'", psFile, r);
+
+  cmd1 = sprintf('powershell -ExecutionPolicy Bypass -Command "& {%s}"', psCmd);
 else
   cmd1 = sprintf('df "%s" | tail -n 1 | awk ''{print $1}''', filepath);
 end
@@ -17,8 +27,7 @@
 
 if ispc()
 
-  y = any(ismember(strip(extractAfter(m1, "DriveType")), ["2", "5"]));
-  % https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-logicaldisk
+  y = contains(m1, "True");
 
 elseif ismac()
 
@@ -37,3 +46,19 @@
 end
 
 end
+
+% We use Powershell .ps1 function because:
+%
+% drive = stdlib.root_name(filepath);
+% WMIC is not available on all systems e.g. GA windows-2025 runner image
+%   WMIC doesn't detect USB flash drives -- it sees them as Fixed drives
+% cmd1 = sprintf('wmic logicaldisk where "DeviceID=''%s''" get DriveType', drive);
+%
+% (Get-Volume -DriveLetter H).DriveType also detects USB thumb drives as Fixed like HDD
+%
+% Get-WmiObject also sees USB as type 3 fixed disk
+% cmd1 = sprintf('pwsh -c "Get-WmiObject Win32_LogicalDisk -Filter ''DeviceID=''%s'''' | Select-Object -ExpandProperty DriveType"', drive);
+
+
+  % WMIC: y = any(ismember(strip(extractAfter(m1, "DriveType")), ["2", "5"]));
+  % https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-logicaldisk

+stdlib/+sys/read_symlink.m

@@ -7,7 +7,7 @@
 if isunix()
   cmd = sprintf('readlink -fn "%s"', p);
 else
-  cmd = sprintf('pwsh -command "(Get-Item -Path %s).Target"', p);
+  cmd = sprintf('pwsh -c "(Get-Item -Path %s).Target"', p);
 end
 
 [s, m] = system(cmd);

+stdlib/+sys/set_modtime.m

@@ -5,7 +5,7 @@
 if ~isfile(file), return, end
 
 if ispc()
-  cmd = sprintf('pwsh -Command "(Get-Item ''%s'').LastWriteTime = ''%s''"', file, string(dt, "yyyy-MM-dd HH:mm:ss"));
+  cmd = sprintf('pwsh -c "(Get-Item ''%s'').LastWriteTime = ''%s''"', file, string(dt, "yyyy-MM-dd HH:mm:ss"));
 elseif ismac()
   cmd = sprintf("touch -mt %s %s", string(dt, "yyyyMMddHHmm"), file);
 else