make-unizip: do not use 7z -r (this flag does not do what you think)

illwieckz · illwieckz · commit 80c8e7befbc8 · 2022-07-27T01:34:59.000+02:00
The -r option of zip is already implied by 7z, the -r option of 7z
does something else, and as the 7z man page says:

&gt; (CAUTION: this flag does not do what you think, avoid using it)
diff --git a/make-unizip b/make-unizip
@@ -93,7 +93,7 @@ done
 # Compress symbols
 (
 	cd "${work_dir}"
-	7z a -tzip -mx=9 -r "unvanquished_${version}/symbols_${version}.zip" symbols
+	7z a -tzip -mx=9 "unvanquished_${version}/symbols_${version}.zip" symbols
 )
 
 # Create (partial) universal zip
@@ -104,7 +104,7 @@ done
 		rm -v "../unvanquished_${version}.zip"
 	fi
 	# Even though almost all the contents are compressed already, it still saves some...
-	7z a -tzip -mx=9 -r "../unvanquished_${version}.zip" "unvanquished_${version}"
+	7z a -tzip -mx=9 "../unvanquished_${version}.zip" "unvanquished_${version}"
 )
 
 rm -rv "${work_dir}"

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ done`
`93`	`93`	`# Compress symbols`
`94`	`94`	`(`
`95`	`95`	`cd "${work_dir}"`
`96`		`- 7z a -tzip -mx=9 -r "unvanquished_${version}/symbols_${version}.zip" symbols`
	`96`	`+ 7z a -tzip -mx=9 "unvanquished_${version}/symbols_${version}.zip" symbols`
`97`	`97`	`)`
`98`	`98`
`99`	`99`	`# Create (partial) universal zip`
`@@ -104,7 +104,7 @@ done`
`104`	`104`	`rm -v "../unvanquished_${version}.zip"`
`105`	`105`	`fi`
`106`	`106`	`# Even though almost all the contents are compressed already, it still saves some...`
`107`		`- 7z a -tzip -mx=9 -r "../unvanquished_${version}.zip" "unvanquished_${version}"`
	`107`	`+ 7z a -tzip -mx=9 "../unvanquished_${version}.zip" "unvanquished_${version}"`
`108`	`108`	`)`
`109`	`109`
`110`	`110`	`rm -rv "${work_dir}"`