Merge pull request calliope-project#423 from calliope-project/overwri…

…te-on-unzip
jnnr · Aug 7, 2024 · 4f2cb40 · 4f2cb40
2 parents 8a1f2e5 + 3929495
commit 4f2cb40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rules/shapes.smk b/rules/shapes.smk
@@ -28,7 +28,7 @@ rule raw_gadm_administrative_borders:
     output: temp("build/data/raw-gadm/gadm36_{country_code}.gpkg")
     conda: "../envs/shell.yaml"
     localrule: True
-    shell: "unzip -o {input} -d build/data/raw-gadm"
+    shell: "unzip {input} 'gadm36_{wildcards.country_code}.gpkg' -d build/data/raw-gadm"
 
 
 rule administrative_borders_gadm:

diff --git a/rules/wind-and-solar.smk b/rules/wind-and-solar.smk
@@ -27,7 +27,7 @@ rule potentials:
         population = "build/data/{resolution}/population.csv",
         land_cover = "build/data/{resolution}/land-cover.csv"
     conda: "../envs/shell.yaml"
-    shell: "unzip -o {input} -d build/data"
+    shell: "unzip {input} '{wildcards.resolution}/*' -d build/data"
 
 
 rule download_capacity_factors_wind_and_solar: