Merge pull request #1559 from ebkr/develop

Develop - Release 3.1.54

CHANGELOG.md

@@ -1,6 +1,11 @@
+### 3.1.54
+#### Bug fix
+- Fixed profile import issue where entries were not found inside zips
+
 ### 3.1.53
 #### Games added
 - WEBFISHING
+- SULFUR
 
 #### Other changes
 - BONELAB support should now function correctly

package.json

@@ -1,6 +1,6 @@
 {
     "name": "r2modman",
-    "version": "3.1.53",
+    "version": "3.1.54",
     "description": "A simple and easy to use mod manager for many games using Thunderstore.",
     "productName": "r2modman",
     "author": "ebkr",

src/_managerinf/ManagerInformation.ts

@@ -1,7 +1,7 @@
 import VersionNumber from '../model/VersionNumber';
 
 export default class ManagerInformation {
-    public static VERSION: VersionNumber = new VersionNumber('3.1.53');
+    public static VERSION: VersionNumber = new VersionNumber('3.1.54');
     public static IS_PORTABLE: boolean = false;
     public static APP_NAME: string = "r2modman";
 }

src/providers/generic/zip/AdmZipProvider.ts

@@ -24,9 +24,9 @@ export default class AdmZipProvider extends ZipProvider {
 
     async extractEntryTo(zip: string | Buffer, target: string, outputPath: string): Promise<void> {
         const adm = new AdmZip(zip);
-        target = target.replace(/\\/g, '/');
+        const safeTarget = target.replace(/\\/g, '/');
         outputPath = outputPath.replace(/\\/g, '/');
-        var fullPath = path.join(outputPath, target).replace(/\\/g, '/');
+        var fullPath = path.join(outputPath, safeTarget).replace(/\\/g, '/');
         if(!path.posix.normalize(fullPath).startsWith(outputPath))
         {
             throw Error("Entry " + target + " would extract outside of expected folder");