gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Further improvements 

downlaod enforcer currently broken
pull/1331/head
Daniel Gibbs 8 years ago
parent
0abbe793be
commit
a4f634dc03
1 changed files with 40 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      lgsm/functions/command_fastdl.sh

69
lgsm/functions/command_fastdl.sh
View File

@ -40,28 +40,30 @@ fn_fastdl_config(){
echo "${fastdldir}" echo "${fastdldir}"
echo "" echo ""
if fn_prompt_yn "Overwrite existing directory?" Y; then if fn_prompt_yn "Overwrite existing directory?" Y; then
clearoldfastdl="on" fn_script_log_info "Overwrite existing directory: YES"
else else
clearoldfastdl="off" core_exit.sh
fi fi
fi fi
# Garry's Mod Specific # Garry's Mod Specific
if [ "${gamename}" == "Garry's Mod" ]; then if [ "${gamename}" == "Garry's Mod" ]; then
# Prompt to clear addons dir from fastdl, can use unnecessary space or not be required depending on addon's file structures # Prompt to clear addons dir from fastdl, can use unnecessary space or not be required depending on addon's file structures
fn_print_dots
if fn_prompt_yn "Clear addons directory from FastDL?" Y; then if fn_prompt_yn "Clear addons directory from FastDL?" Y; then
cleargmodaddons="on"; cleargmodaddons="on";
fn_script_log_info "Clear addons directory from FastDL: YES"
else else
cleargmodaddons="off"; cleargmodaddons="off";
fn_script_log_info "Clear addons directory from FastDL: NO"
fi fi
# Prompt for download enforcer, which is using a .lua addfile resource generator # Prompt for download enforcer, which is using a .lua addfile resource generator
fn_print_dots
if fn_prompt_yn "Use client download enforcer?" Y; then if fn_prompt_yn "Use client download enforcer?" Y; then
luaressource="on" luaressource="on"
fn_script_log_info "Use client download enforcer: YES"
else else
luaressource="off" luaressource="off"
fn_script_log_info "Use client download enforcer: NO"
fi fi
fi fi
} }
@ -74,11 +76,11 @@ fn_fastdl_dirs(){
exitcode=$? exitcode=$?
if [ ${exitcode} -ne 0 ]; then if [ ${exitcode} -ne 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "creating web directory ${webdir}..." fn_script_log_fatal "Creating web directory ${webdir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "creating web directory ${webdir}..." fn_script_log_pass "Creating web directory ${webdir}"
fi fi
sleep 0.5 sleep 0.5
fi fi
@ -88,11 +90,11 @@ fn_fastdl_dirs(){
exitcode=$? exitcode=$?
if [ ${exitcode} -ne 0 ]; then if [ ${exitcode} -ne 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "creating fastdl directory ${fastdldir}..." fn_script_log_fatal "Creating fastdl directory ${fastdldir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "creating fastdl directory ${fastdldir}..." fn_script_log_pass "Creating fastdl directory ${fastdldir}"
fi fi
sleep 0.5 sleep 0.5
fi fi
@ -106,11 +108,11 @@ fn_clear_old_fastdl(){
exitcode=$? exitcode=$?
if [ ${exitcode} -ne 0 ]; then if [ ${exitcode} -ne 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "clearing existing FastDL directory ${fastdldir}..." fn_script_log_fatal "Clearing existing FastDL directory ${fastdldir}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "clearing existing FastDL directory ${fastdldir}..." fn_script_log_pass "Clearing existing FastDL directory ${fastdldir}"
fi fi
sleep 0.5 sleep 0.5
fi fi
@ -133,7 +135,6 @@ fn_fastdl_gmod(){
# Clear addons directory in fastdl # Clear addons directory in fastdl
if [ "${cleargmodaddons}" == "on" ]; then if [ "${cleargmodaddons}" == "on" ]; then
echo -en "clearing addons dir from fastdl dir" echo -en "clearing addons dir from fastdl dir"
fn_script_log "clearing addons dir from fastdl dir..."
sleep 1 sleep 1
rm -R "${fastdldir:?}/addons" rm -R "${fastdldir:?}/addons"
exitcode=$? exitcode=$?
@ -147,7 +148,6 @@ fn_fastdl_gmod(){
fi fi
fi fi
fi fi
# Correct content that may be into a lua directory by mistake like some darkrpmodification addons # Correct content that may be into a lua directory by mistake like some darkrpmodification addons
if [ -d "${fastdldir}/lua" ]; then if [ -d "${fastdldir}/lua" ]; then
echo -en "correcting DarkRP files..." echo -en "correcting DarkRP files..."
@ -229,13 +229,13 @@ fn_fastdl_source(){
fn_fastdl_dirs fn_fastdl_dirs
echo -e "copying files to ${fastdldir}" echo -e "copying files to ${fastdldir}"
fn_script_log "copying files to ${fastdldir}" fn_script_log_info "Copying files to ${fastdldir}"
else else
if [ -f "${tmpdir}/fastdl_files_to_compress.txt" ]; then if [ -f "${tmpdir}/fastdl_files_to_compress.txt" ]; then
rm -f "${tmpdir}/fastdl_files_to_compress.txt" rm -f "${tmpdir}/fastdl_files_to_compress.txt"
fi fi
echo -e "analyzing required files" echo -e "analysing required files"
fn_script_log "analyzing required files" fn_script_log_info "Analysing required files"
fi fi
local directorys_array=( "maps" "materials" "particles" "sounds" ) local directorys_array=( "maps" "materials" "particles" "sounds" )
@ -273,17 +273,26 @@ fn_fastdl_source(){
tput sc tput sc
if [ -z "${copyflag}" ]; then if [ -z "${copyflag}" ]; then
tput rc; tput el tput rc; tput el
printf "gathering ${directory} ${allowed_extention} : ${fileswc}..." printf "copying ${directory} ${allowed_extention} : ${fileswc}..."
fi fi
while read -r mapfile; do while read -r mapfile; do
((fileswc++)) ((fileswc++))
if [ -n "${copyflag}" ]; then if [ -n "${copyflag}" ]; then
tput rc; tput el tput rc; tput el
printf "copying ${directory} ${allowed_extention} : ${fileswc}..." printf "copying ${directory} ${allowed_extention} : ${fileswc}..."
sleep 0.01
if [ ! -d "${fastdldir}/${directory}" ]; then if [ ! -d "${fastdldir}/${directory}" ]; then
mkdir "${fastdldir}/${directory}" mkdir "${fastdldir}/${directory}"
fi fi
cp "${mapfile}" "${fastdldir}/${directory}" cp "${mapfile}" "${fastdldir}/${directory}"
exitcode=$?
if [ ${exitcode} -ne 0 ]; then
fn_print_fail_eol_nl
fn_script_log_fatal "Copying ${mapfile} > ${fastdldir}/${directory}"
core_exit.sh
else
fn_script_log_pass "Copying ${mapfile} > ${fastdldir}/${directory}"
fi
else else
tput rc; tput el tput rc; tput el
printf "gathering ${directory} ${allowed_extention} : ${fileswc}..." printf "gathering ${directory} ${allowed_extention} : ${fileswc}..."
@ -313,7 +322,8 @@ fn_fastdl_source(){
fi fi
if [ -z "${copyflag}" ]; then if [ -z "${copyflag}" ]; then
echo "about to compress ${totalfiles} files, total size $(fn_human_readable_file_size ${filesizetotal} 0) " echo "about to compress ${totalfiles} files, total size $(fn_human_readable_file_size ${filesizetotal} 0)"
fn_script_log_info "${totalfiles} files, total size $(fn_human_readable_file_size ${filesizetotal} 0)"
rm "${tmpdir}/fastdl_files_to_compress.txt" rm "${tmpdir}/fastdl_files_to_compress.txt"
if fn_prompt_yn "Continue?" Y; then if fn_prompt_yn "Continue?" Y; then
copyflag=1 copyflag=1
@ -322,6 +332,9 @@ fn_fastdl_source(){
core_exit.sh core_exit.sh
fi fi
else else
if [ "${gamename}" == "Garry's Mod" ]; then
fn_fastdl_gmod_lua_enforcer
fi
fn_fastdl_bzip2 fn_fastdl_bzip2
fi fi
} }
@ -330,34 +343,33 @@ fn_fastdl_source(){
fn_fastdl_gmod_lua_enforcer(){ fn_fastdl_gmod_lua_enforcer(){
# Remove lua file if luaressource is turned off and file exists # Remove lua file if luaressource is turned off and file exists
if [ -f "${luafastdlfullpath}" ]; then if [ -f "${luafastdlfullpath}" ]; then
echo -en "removing existing download enforcer..." echo -en "removing existing download enforcer: ${luafastdlfile}..."
rm -R "${luafastdlfullpath:?}" rm -R "${luafastdlfullpath:?}"
exitcode=$? exitcode=$?
if [ ${exitcode} -ne 0 ]; then if [ ${exitcode} -ne 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "removing existing download enforcer" fn_script_log_fatal "removing existing download enforcer ${luafastdlfullpath}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "removing existing download enforcer" fn_script_log_pass "removing existing download enforcer ${luafastdlfullpath}"
fi fi
fi fi
# Remove old lua file and generate a new one if user said yes # Remove old lua file and generate a new one if user said yes
if [ "${luaressource}" == "on" ]; then if [ "${luaressource}" == "on" ]; then
echo -en "creating new download enforcer..." echo -en "creating new download enforcer: ${luafastdlfile}..."
fn_script_log "creating new download enforcer"
# Read all filenames and put them into a lua file at the right path # Read all filenames and put them into a lua file at the right path
find "${fastdldir:?}" \( -type f ! -name "*.bz2" \) -printf '%P\n' | while read line; do find "${fastdldir:?}" \( -type f -name "*.bz2" \) -printf '%P\n' | while read line; do
echo "resource.AddFile( "\""${line}"\"" )" >> "${luafastdlfullpath}" echo "resource.AddFile( "\""${line}"\"" )" >> "${luafastdlfullpath}"
done done
exitcode=$? exitcode=$?
if [ ${exitcode} -ne 0 ]; then if [ ${exitcode} -ne 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "creating new download enforcer" fn_script_log_fatal "creating new download enforcer ${luafastdlfullpath}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "creating new download enforcer" fn_script_log_pass "creating new download enforcer ${luafastdlfullpath}"
fi fi
fi fi
} }
@ -369,11 +381,11 @@ fn_fastdl_bzip2(){
exitcode=$? exitcode=$?
if [ ${exitcode} -ne 0 ]; then if [ ${exitcode} -ne 0 ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
fn_script_log_fatal "creating web directory ${webdir}..." fn_script_log_fatal "compressing ${filetocompress}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "creating web directory ${webdir}..." fn_script_log_pass "compressing ${filetocompress}"
fi fi
done < <(find "${fastdldir:?}" \( -type f ! -name "*.bz2" \)) done < <(find "${fastdldir:?}" \( -type f ! -name "*.bz2" \))
} }
@ -383,7 +395,7 @@ fn_fastdl_completed(){
echo "FastDL files are located in:" echo "FastDL files are located in:"
echo "${webdir}" echo "${webdir}"
echo "FastDL completed" echo "FastDL completed"
fn_script_log "FastDL completed" fn_script_log_info "FastDL completed"
} }
# Run functions # Run functions
@ -394,7 +406,6 @@ fn_fastdl_config
fn_fastdl_source fn_fastdl_source
if [ "${gamename}" == "Garry's Mod" ]; then if [ "${gamename}" == "Garry's Mod" ]; then
fn_fastdl_gmod fn_fastdl_gmod
fn_fastdl_gmod_lua_enforcer
fi fi
fn_fastdl_completed fn_fastdl_completed
core_exit.sh core_exit.sh

Write Preview
Loading…
Cancel
Save