triplea-game/triplea

1941 Global Command Decision map folder has -master folder

Closed this issue · 7 comments

TheDog-GH commented

@asvitkine @DanVanAtta @frigoref @beelee1 @RogerCooper

I have just updated 1941 Global Command Decision to v190 on GitHub

I thought I had done what I usually do, but for some reason the map now downloads with a folder called
1941_global_command_decision-master

inside 1941_global_command_decision folder

The Zip also has the same, please advise on how to correct this and remove the 1941_global_command_decision-master folder

GitHub map link
https://github.com/triplea-maps/1941_global_command_decision

beelee1 commented

yea I noticed that a couple months ago. Idky it does it :)

  • 👍1
panther2 commented

This seems to be caused by the TripleA-installation-process:
https://forums.triplea-game.org/post/65331

  • 👍1
TheDog-GH commented

Thanks to Panther for pointing me in the right direction.

This is the version that causes the additional folder with a -master addition
https://github.com/triplea-game/triplea/releases/tag/2.7.14825

@DanVanAtta
When you have time, please take a look.

  • 👍1
frigoref commented

@TheDog-GH, @beelee1, @panther2 Let me try to summarize what the requested change of functionality to the current behavior is:
Map zip files that contain only one subfolder (e.g. a folder of name pattern '*-master') are supposed to be unzipped AND (this is the new part) the contained subfolder level should be removed, i.e., the files contained in this subfolder should be moved up on level and the (now empty) subfolder on this level should be removed.

With the link from @TheDog-GH I found the code place which seems to have taken care of this before which got deleted:
image

PR 13002 (Unzip without master subfolder) created and merged.

Please provide feedback.

PS: Please try to express clearly at the beginning of each issue the as-is, to-be, the difference and reasoning for change to make it easier especially for the technical guys to understand the what and why for a change.

  • 👍1
TheDog-GH commented

for the to-be
There are 2 variants and I can only comment on one, the most recent. Yes to
the files contained in this subfolder should be moved up on level and the (now empty) subfolder on this level should be removed

.
The 2nd older variant I cannot comment on, as I have not seen it, so don't know what it looks like.

panther2 commented

PR 13002 (Unzip without master subfolder) created and merged.

Please provide feedback.

TripleA 2.7.14900 installs the downloaded map as expected again. Thank you.

  • 👍1
frigoref commented

@TheDog-GH, @beelee1, @panther2 Thanks everyone!

  • 👍1