Browse Source

fix extraction

pull/4633/head
Daniel Gibbs 12 months ago
parent
commit
37bfcc7518
No known key found for this signature in database GPG Key ID: 2076B128385E8C55
  1. 5
      lgsm/modules/core_dl.sh
  2. 8
      lgsm/modules/install_server_files.sh

5
lgsm/modules/core_dl.sh

@ -251,7 +251,10 @@ fn_dl_extract() {
fi fi
elif [ "${mime}" == "application/zip" ]; then elif [ "${mime}" == "application/zip" ]; then
if [ -n "${extractsrc}" ]; then if [ -n "${extractsrc}" ]; then
extractcmd=$(unzip -qoj -d "${extractdest}" "${local_filedir}/${local_filename}" "${extractsrc}"/*) temp_extractdir="${tmpdir}/Xonotic"
extractcmd=$(unzip -qo "${local_filedir}/${local_filename}" "${extractsrc}/*" -d "${temp_extractdir}")
find "${temp_extractdir}/${extractsrc}" -mindepth 1 -maxdepth 1 -exec mv -t "${extractdest}" {} +
rm -rf "${temp_extractdir}"
else else
extractcmd=$(unzip -qo -d "${extractdest}" "${local_filedir}/${local_filename}") extractcmd=$(unzip -qo -d "${extractdest}" "${local_filedir}/${local_filename}")
fi fi

8
lgsm/modules/install_server_files.sh

@ -224,14 +224,6 @@ fn_install_server_files() {
run="norun" run="norun"
force="noforce" force="noforce"
md5="93705e165550c97484678236749198a4" md5="93705e165550c97484678236749198a4"
elif [ "${shortname}" == "xnt" ]; then
remote_fileurl="https://dl.xonotic.org/xonotic-0.8.6.zip"
local_filedir="${tmpdir}"
local_filename="xonotic-0.8.6.zip"
chmodx="nochmodx"
run="norun"
force="noforce"
md5="32cdf9f90930e4599177dafc41adda48"
elif [ "${shortname}" == "zmr" ]; then elif [ "${shortname}" == "zmr" ]; then
remote_fileurl="http://linuxgsm.download/ZombieMasterReborn/zombie_master_reborn_b6_1.tar.xz" remote_fileurl="http://linuxgsm.download/ZombieMasterReborn/zombie_master_reborn_b6_1.tar.xz"
local_filedir="${tmpdir}" local_filedir="${tmpdir}"

Loading…
Cancel
Save