diff --git a/bin/monitor.php b/bin/monitor.php index be1ce99a6..9da078498 100644 --- a/bin/monitor.php +++ b/bin/monitor.php @@ -394,9 +394,9 @@ while($i>0) //set command for running backfill if ( $array['BACKFILL_THREADS'] == "true" ) { - $_backfill_cmd = 'backfill_threaded.php'; + $_backfill_cmd = 'cd $_bin && $_php backfill_threaded.php'; } else { - $_backfill_cmd = 'backfill.php'; + $_backfill_cmd = 'cd $NNPATH && $_php backfill.php'; } //set command for nzb-import @@ -423,7 +423,7 @@ while($i>0) //runs backfill in 0.10 once if needed and exits if (( $array['BACKFILL'] == "true" ) && (( $total_work_now < $array['BACKFILL_MAX_RELEASES'] ) || ( $array['BACKFILL_MAX_RELEASES'] == 0 )) && (( $parts_rows_unformated < $array['BACKFILL_MAX_ROWS'] ) || ( $array['BACKFILL_MAX_ROWS'] == 0 ))) { $color = get_color(); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:0.10 'echo \"\033[38;5;\"$color\"m\" && $ds1 backfill $ds2 && cd $NNPATH && $_php $_backfill_cmd && \ + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:0.10 'echo \"\033[38;5;\"$color\"m\" && $ds1 backfill $ds2 && $_backfill_cmd && \ $mysql_command_1 && \ echo \" \033[1;0;33m\" && echo \"$_sleep_string {$array['BACKFILL_SLEEP']} seconds...\" && sleep {$array['BACKFILL_SLEEP']} && $ds1 backfill $ds3' 2>&1 1> /dev/null"); } elseif (( $parts_rows_unformated > $array['BACKFILL_MAX_ROWS'] ) && ( $array['BACKFILL'] == "true" ) && ( $array['BACKFILL_MAX_ROWS'] != 0 )) { @@ -445,7 +445,7 @@ while($i>0) $time13 = TIME(); } elseif (( TIME() - $time14 >= $array['BACKFILL_SEQ_TIMER'] ) && ( $array['BACKFILL'] == "true" ) && (( $total_work_now < $array['BACKFILL_MAX_RELEASES'] ) || ( $array['BACKFILL_MAX_RELEASES'] == 0 )) && (( $parts_rows_unformated < $array['BACKFILL_MAX_ROWS'] ) || ( $array['BACKFILL_MAX_ROWS'] == 0 ))) { $color = get_color(); - shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:0.9 'echo \"\033[38;5;\"$color\"m\" && $ds1 backfill $ds2 && cd $NNPATH && $_php $_backfill_cmd && \ + shell_exec("$_tmux respawnp -t {$array['TMUX_SESSION']}:0.9 'echo \"\033[38;5;\"$color\"m\" && $ds1 backfill $ds2 && $_backfill_cmd && \ $mysql_command_1 && echo \" \033[1;0;33m\" && $ds1 backfill $ds3' 2>&1 1> /dev/null"); $time14 = TIME(); } diff --git a/config.sh b/config.sh index f1f80e0f1..cacfe416b 100644 --- a/config.sh +++ b/config.sh @@ -41,7 +41,7 @@ export MONITOR_UPDATE="30" ############################################################ -#You can have backfill loop constantly and interject binaries every so oftern +#You can have backfill loop constantly and interject binaries every so often #by setting this next to true, if true, the normal backfill pane will be dead #this may be the preferred method, going foward export SEQUENTIAL="true" @@ -183,7 +183,10 @@ export INNODB="false" #to actually do anything, directions are in the file export CLEANUP="false" -#How oftern do you want update_cleanup.php and removespecial.php to run, in seconds +#edit update_cleanup.php and update_parsing.php and svn up +export CLEANUP_EDIT="false" + +#How often do you want update_cleanup.php and removespecial.php to run, in seconds export CLEANUP_TIMER="3600" ############################################################ @@ -193,7 +196,7 @@ export CLEANUP_TIMER="3600" #to actually do anything, directions are in the file export PARSING="false" -#How oftern do you want update_parsing.php to run, in seconds +#How often do you want update_parsing.php to run, in seconds export PARSING_TIMER="3600" ############################################################ diff --git a/scripts/update_svn.sh b/scripts/update_svn.sh index fb898bf47..594ffe5d1 100755 --- a/scripts/update_svn.sh +++ b/scripts/update_svn.sh @@ -34,10 +34,18 @@ echo " " cd $NEWZPATH"/www/lib/smarty/templates_c/" rm -fv * +#edit cleanup scripts +if [[ $CLEANUP_EDIT == "true" ]]; then + sed -i -e 's/$echo =.*$/$echo = false;/' $TESTING_PATH/update_parsing.php + sed -i -e 's/$limited =.*$/$limited = false;/' $TESTING_PATH/update_parsing.php + sed -i -e 's/$echo =.*$/$echo = false;/' $TESTING_PATH/update_cleanup.php + sed -i -e 's/$limited =.*$/$limited = false;/' $TESTING_PATH/update_cleanup.php +fi + #import kevin123's compression mod if [[ $KEVINS_COMP == "true" ]]; then - cd $NEWZPATH"/misc/update_scripts/nix_scripts/tmux/kevin123" - cp -frv * $NEWZPATH/www/lib/ + cd $NEWZPATH"/misc/update_scripts/nix_scripts/tmux/kevin123" + cp -frv * $NEWZPATH/www/lib/ fi #set prmission