Fix plugin install failing with EXDEV when temp and userData are on different filesystems
This commit is contained in:
@@ -38,7 +38,7 @@ Paarrot includes a plugin system for extending and customising the app with Java
|
|||||||
|
|
||||||
1. Drop a plugin folder into your plugins directory:
|
1. Drop a plugin folder into your plugins directory:
|
||||||
- **Windows**: `%APPDATA%\paarrot\plugins\<plugin-name>\`
|
- **Windows**: `%APPDATA%\paarrot\plugins\<plugin-name>\`
|
||||||
- **Linux**: `~/.config/Paarrot/plugins/<plugin-name>/`
|
- **Linux**: `~/.config/Paarrot/plugins/<plugin-name>/` for the packaged app, `~/.config/paarrot/plugins/<plugin-name>/` when running from source
|
||||||
- **macOS**: `~/Library/Application Support/Paarrot/plugins/<plugin-name>/`
|
- **macOS**: `~/Library/Application Support/Paarrot/plugins/<plugin-name>/`
|
||||||
2. Enable it in **Settings → Plugins → Installed**
|
2. Enable it in **Settings → Plugins → Installed**
|
||||||
|
|
||||||
|
|||||||
+4
-3
@@ -1758,7 +1758,7 @@ ipcMain.handle('plugin:download', async (event, { pluginId, downloadUrl, name })
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}).on('error', (err) => {
|
}).on('error', (err) => {
|
||||||
fs.unlinkSync(tempZipPath);
|
fs.rmSync(tempZipPath, { force: true });
|
||||||
reject(err);
|
reject(err);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1788,13 +1788,14 @@ ipcMain.handle('plugin:download', async (event, { pluginId, downloadUrl, name })
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Move contents to final plugin directory
|
// Move contents to final plugin directory. renameSync throws EXDEV when
|
||||||
|
// temp and userData are on different filesystems (Linux: /tmp is tmpfs).
|
||||||
fs.mkdirSync(pluginDir, { recursive: true });
|
fs.mkdirSync(pluginDir, { recursive: true });
|
||||||
const files = fs.readdirSync(sourceDir);
|
const files = fs.readdirSync(sourceDir);
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
const srcPath = path.join(sourceDir, file);
|
const srcPath = path.join(sourceDir, file);
|
||||||
const destPath = path.join(pluginDir, file);
|
const destPath = path.join(pluginDir, file);
|
||||||
fs.renameSync(srcPath, destPath);
|
fs.cpSync(srcPath, destPath, { recursive: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clean up temp extract dir
|
// Clean up temp extract dir
|
||||||
|
|||||||
Reference in New Issue
Block a user