fix: escape slash on windows (#24)

* ci: add windows and macos to the matrix * ci: remove SHELL * fix: escape slash on windows Fixes pnpm/pnpm#5420 * ci: reduce matrix size * test: fix
pnpm · Feb 2, 2024 · e2e1973 · e2e1973
1 parent accadf0
commit e2e1973
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,12 +7,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node:
-          - '18'
-          - '20'
-          - '21'
-        platform:
-          - ubuntu-latest
+        include:
+          - node: '18'
+            platform: ubuntu-latest
+          - node: '20'
+            platform: ubuntu-latest
+          - node: '21'
+            platform: ubuntu-latest
+          - node: '20'
+            platform: windows-latest
+          - node: '20'
+            platform: macos-latest
 
     name: '${{matrix.platform}} / Node.js ${{ matrix.node }}'
     runs-on: ${{matrix.platform}}
@@ -31,7 +36,7 @@ jobs:
     - name: pnpm install
       run: pnpm install
     - name: run tests
-      run: SHELL=/bin/bash pnpm test
+      run: pnpm test
 
   typecheck:
     name: Type Check

diff --git a/lib/installer.js b/lib/installer.js
@@ -60,6 +60,10 @@ const locationFromShell = shell => {
  * @param {SupportedShell} shell - Shell to base the check on
  */
 const sourceLineForShell = (scriptname, shell) => {
+  // Windows naturally uses `\` as path separator, which would be misinterpreted by the
+  // shell interpreters.
+  scriptname = scriptname.replaceAll('\\', '/');
+
   if (shell === 'fish') {
     return `[ -f ${scriptname} ]; and . ${scriptname}; or true`;
   }

diff --git a/test/installer.js b/test/installer.js
@@ -87,7 +87,7 @@ describe('installer', () => {
           assert.ok(/uninstall by removing these lines/.test(filecontent));
           assert.ok(
             filecontent.match(
-              `. ${path.join(COMPLETION_DIR, 'bash/__tabtab.bash')}`
+              `. ${path.join(COMPLETION_DIR, 'bash/__tabtab.bash').replaceAll('\\', '/')}`
             )
           );
         })
@@ -100,7 +100,7 @@ describe('installer', () => {
         .then(filecontent => {
           assert.ok(/tabtab source for foo/.test(filecontent));
           assert.ok(
-            filecontent.match(`. ${path.join(COMPLETION_DIR, 'bash/foo.bash')}`)
+            filecontent.match(`. ${path.join(COMPLETION_DIR, 'bash/foo.bash').replaceAll('\\', '/')}`)
           );
         }));
 

diff --git a/test/tabtab-install.js b/test/tabtab-install.js
@@ -69,7 +69,7 @@ describe('tabtab.install()', () => {
     );
     assert.ok(/tabtab source for foo/.test(filecontent));
     assert.ok(
-      filecontent.match(`. ${path.join(COMPLETION_DIR, 'bash/foo.bash')}`)
+      filecontent.match(`. ${path.join(COMPLETION_DIR, 'bash/foo.bash').replaceAll('\\', '/')}`)
     );
   });