diff --git a/Changelog b/Changelog index 2274874fc..4176eff83 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-11-06 DariusIII + * Chg: Move scripts from update/nix to update, remove nix folder * Chg: Remove windows scripts * Chg: Update Forking class * Chg: Update ProcessReleases class diff --git a/app/Console/Commands/TmuxUIStart.php b/app/Console/Commands/TmuxUIStart.php index 190f497d3..ae9de4502 100644 --- a/app/Console/Commands/TmuxUIStart.php +++ b/app/Console/Commands/TmuxUIStart.php @@ -41,7 +41,7 @@ class TmuxUIStart extends Command */ public function handle() { - $process = new Process('php misc/update/nix/tmux/start.php'); + $process = new Process('php misc/update/tmux/start.php'); $process->setTty(true); $process->run(function ($type, $buffer) { if (Process::ERR === $type) { diff --git a/app/Console/Commands/TmuxUIStop.php b/app/Console/Commands/TmuxUIStop.php index d4a96176d..d9eb08fcf 100644 --- a/app/Console/Commands/TmuxUIStop.php +++ b/app/Console/Commands/TmuxUIStop.php @@ -45,29 +45,31 @@ class TmuxUIStop extends Command public function handle() { if ($this->argument('type') === 'false' || $this->argument('type') === 'true') { - $process = new Process('php misc/update/nix/tmux/stop.php'); + $process = new Process('php misc/update/tmux/stop.php'); $process->setTimeout(600); - $process->run(function ($type, $buffer) { - if (Process::ERR === $type) { - echo 'ERR > '.$buffer; - } else { - echo $buffer; - } - } - ); - - if ($this->argument('type') === 'true') { - $sessionName = Tmux::value('tmux_session'); - $tmuxSession = new Process('tmux kill-session -t '.$sessionName); - $this->info('Killing active tmux session: '.$sessionName); - $tmuxSession->run(function ($type, $buffer) { + $process->run( + function ($type, $buffer) { if (Process::ERR === $type) { echo 'ERR > '.$buffer; } else { echo $buffer; } } - ); + ); + + if ($this->argument('type') === 'true') { + $sessionName = Tmux::value('tmux_session'); + $tmuxSession = new Process('tmux kill-session -t '.$sessionName); + $this->info('Killing active tmux session: '.$sessionName); + $tmuxSession->run( + function ($type, $buffer) { + if (Process::ERR === $type) { + echo 'ERR > '.$buffer; + } else { + echo $buffer; + } + } + ); } } else { $this->error($this->description); diff --git a/misc/update/nix/multiprocessing/.do_not_run/switch.php b/misc/update/multiprocessing/.do_not_run/switch.php similarity index 100% rename from misc/update/nix/multiprocessing/.do_not_run/switch.php rename to misc/update/multiprocessing/.do_not_run/switch.php diff --git a/misc/update/nix/multiprocessing/.gitignore b/misc/update/multiprocessing/.gitignore similarity index 100% rename from misc/update/nix/multiprocessing/.gitignore rename to misc/update/multiprocessing/.gitignore diff --git a/misc/update/nix/multiprocessing/README.md b/misc/update/multiprocessing/README.md similarity index 100% rename from misc/update/nix/multiprocessing/README.md rename to misc/update/multiprocessing/README.md diff --git a/misc/update/nix/multiprocessing/backfill.php b/misc/update/multiprocessing/backfill.php similarity index 100% rename from misc/update/nix/multiprocessing/backfill.php rename to misc/update/multiprocessing/backfill.php diff --git a/misc/update/nix/multiprocessing/binaries.php b/misc/update/multiprocessing/binaries.php similarity index 100% rename from misc/update/nix/multiprocessing/binaries.php rename to misc/update/multiprocessing/binaries.php diff --git a/misc/update/nix/multiprocessing/fixrelnames.php b/misc/update/multiprocessing/fixrelnames.php similarity index 100% rename from misc/update/nix/multiprocessing/fixrelnames.php rename to misc/update/multiprocessing/fixrelnames.php diff --git a/misc/update/nix/multiprocessing/import.php b/misc/update/multiprocessing/import.php similarity index 100% rename from misc/update/nix/multiprocessing/import.php rename to misc/update/multiprocessing/import.php diff --git a/misc/update/nix/multiprocessing/postprocess.php b/misc/update/multiprocessing/postprocess.php similarity index 100% rename from misc/update/nix/multiprocessing/postprocess.php rename to misc/update/multiprocessing/postprocess.php diff --git a/misc/update/nix/multiprocessing/releases.php b/misc/update/multiprocessing/releases.php similarity index 100% rename from misc/update/nix/multiprocessing/releases.php rename to misc/update/multiprocessing/releases.php diff --git a/misc/update/nix/multiprocessing/requestid.php b/misc/update/multiprocessing/requestid.php similarity index 100% rename from misc/update/nix/multiprocessing/requestid.php rename to misc/update/multiprocessing/requestid.php diff --git a/misc/update/nix/multiprocessing/safe.php b/misc/update/multiprocessing/safe.php similarity index 100% rename from misc/update/nix/multiprocessing/safe.php rename to misc/update/multiprocessing/safe.php diff --git a/misc/update/nix/multiprocessing/settings.php.example b/misc/update/multiprocessing/settings.php.example similarity index 100% rename from misc/update/nix/multiprocessing/settings.php.example rename to misc/update/multiprocessing/settings.php.example diff --git a/misc/update/nix/multiprocessing/update_per_group.php b/misc/update/multiprocessing/update_per_group.php similarity index 100% rename from misc/update/nix/multiprocessing/update_per_group.php rename to misc/update/multiprocessing/update_per_group.php diff --git a/misc/update/nix/screen/sequential/.gitignore b/misc/update/screen/sequential/.gitignore similarity index 100% rename from misc/update/nix/screen/sequential/.gitignore rename to misc/update/screen/sequential/.gitignore diff --git a/misc/update/nix/screen/sequential/README.txt b/misc/update/screen/sequential/README.txt similarity index 100% rename from misc/update/nix/screen/sequential/README.txt rename to misc/update/screen/sequential/README.txt diff --git a/misc/update/nix/screen/sequential/simple.sh b/misc/update/screen/sequential/simple.sh similarity index 100% rename from misc/update/nix/screen/sequential/simple.sh rename to misc/update/screen/sequential/simple.sh diff --git a/misc/update/nix/screen/sequential/threaded.sh b/misc/update/screen/sequential/threaded.sh similarity index 98% rename from misc/update/nix/screen/sequential/threaded.sh rename to misc/update/screen/sequential/threaded.sh index 8916d20c1..69991e51c 100755 --- a/misc/update/nix/screen/sequential/threaded.sh +++ b/misc/update/screen/sequential/threaded.sh @@ -30,7 +30,7 @@ export TEST_PATH="${NNTMUX_ROOT}/misc/testing/Releases" export DEV_PATH="${NNTMUX_ROOT}/misc/testing/Dev" export DB_PATH="${NNTMUX_ROOT}/misc/testing/DB" export THREADED_PATH="${NNTMUX_ROOT}/misc/update/python" -export MULTI_PATH="${NNTMUX_ROOT}/misc/update/nix/multiprocessing" +export MULTI_PATH="${NNTMUX_ROOT}/misc/update/multiprocessing" export NNTMUX_SLEEP_TIME="60" # in seconds command -v php5 >/dev/null 2>&1 && export PHP=`command -v php5` || { export PHP=`command -v php`; } @@ -99,7 +99,7 @@ do # ## NZB Import # echo "--- Import ---" -# $PHP ${MULTI_PATH}/import.php #NZB import - see /misc/update/nix/multiprocessing/import.php for required arguments. +# $PHP ${MULTI_PATH}/import.php #NZB import - see /misc/update/multiprocessing/import.php for required arguments. # ## Release Processing echo "--- Create Releases ---" diff --git a/misc/update/nix/screen/threaded/README.txt b/misc/update/screen/threaded/README.txt similarity index 100% rename from misc/update/nix/screen/threaded/README.txt rename to misc/update/screen/threaded/README.txt diff --git a/misc/update/nix/screen/threaded/helper.sh b/misc/update/screen/threaded/helper.sh similarity index 100% rename from misc/update/nix/screen/threaded/helper.sh rename to misc/update/screen/threaded/helper.sh diff --git a/misc/update/nix/screen/threaded/start.sh b/misc/update/screen/threaded/start.sh similarity index 93% rename from misc/update/nix/screen/threaded/start.sh rename to misc/update/screen/threaded/start.sh index c1642d31e..f080fd021 100755 --- a/misc/update/nix/screen/threaded/start.sh +++ b/misc/update/screen/threaded/start.sh @@ -8,8 +8,8 @@ else fi export NNTMUX_PATH="${NNTMUX_ROOT}/misc/update" -export HELP_PATH="${NNTMUX_ROOT}/misc/update/nix/screen/threaded" -export THREAD_PATH="${NNTMUX_ROOT}/misc/update/nix/multiprocessing" +export HELP_PATH="${NNTMUX_ROOT}/misc/update/screen/threaded" +export THREAD_PATH="${NNTMUX_ROOT}/misc/update/multiprocessing" export TEST_PATH="${NNTMUX_ROOT}/misc/testing" command -v php5 >/dev/null 2>&1 && export PHP=`command -v php5` || { export PHP=`command -v php`; } diff --git a/misc/update/nix/tmux/bin/groupfixrelnames.php b/misc/update/tmux/bin/groupfixrelnames.php similarity index 100% rename from misc/update/nix/tmux/bin/groupfixrelnames.php rename to misc/update/tmux/bin/groupfixrelnames.php diff --git a/misc/update/nix/tmux/bin/postprocess_pre.php b/misc/update/tmux/bin/postprocess_pre.php similarity index 100% rename from misc/update/nix/tmux/bin/postprocess_pre.php rename to misc/update/tmux/bin/postprocess_pre.php diff --git a/misc/update/nix/tmux/bin/postprocess_threaded.php b/misc/update/tmux/bin/postprocess_threaded.php similarity index 100% rename from misc/update/nix/tmux/bin/postprocess_threaded.php rename to misc/update/tmux/bin/postprocess_threaded.php diff --git a/misc/update/nix/tmux/bin/showsleep.php b/misc/update/tmux/bin/showsleep.php similarity index 100% rename from misc/update/nix/tmux/bin/showsleep.php rename to misc/update/tmux/bin/showsleep.php diff --git a/misc/update/nix/tmux/bin/tmux-mem-cpu-load b/misc/update/tmux/bin/tmux-mem-cpu-load similarity index 100% rename from misc/update/nix/tmux/bin/tmux-mem-cpu-load rename to misc/update/tmux/bin/tmux-mem-cpu-load diff --git a/misc/update/nix/tmux/bin/tmux-mem-cpu-load-x32 b/misc/update/tmux/bin/tmux-mem-cpu-load-x32 similarity index 100% rename from misc/update/nix/tmux/bin/tmux-mem-cpu-load-x32 rename to misc/update/tmux/bin/tmux-mem-cpu-load-x32 diff --git a/misc/update/nix/tmux/bin/update_groups.php b/misc/update/tmux/bin/update_groups.php similarity index 100% rename from misc/update/nix/tmux/bin/update_groups.php rename to misc/update/tmux/bin/update_groups.php diff --git a/misc/update/nix/tmux/logs/.gitignore b/misc/update/tmux/logs/.gitignore similarity index 100% rename from misc/update/nix/tmux/logs/.gitignore rename to misc/update/tmux/logs/.gitignore diff --git a/misc/update/nix/tmux/monitor.php b/misc/update/tmux/monitor.php similarity index 97% rename from misc/update/nix/tmux/monitor.php rename to misc/update/tmux/monitor.php index ad875ff6f..5b7d718e9 100644 --- a/misc/update/nix/tmux/monitor.php +++ b/misc/update/tmux/monitor.php @@ -35,7 +35,7 @@ $show_time = (NN_DEBUG ? '/usr/bin/time' : ''); $runVar['commands']['_php'] = $show_time." nice -n{$tmux_niceness} $PHP"; $runVar['commands']['_phpn'] = "nice -n{$tmux_niceness} $PHP"; $runVar['commands']['_python'] = $show_time." nice -n{$tmux_niceness} $PYTHON"; -$runVar['commands']['_sleep'] = "{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update/nix/tmux/bin/showsleep.php"; +$runVar['commands']['_sleep'] = "{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update/tmux/bin/showsleep.php"; //spawn IRCScraper as soon as possible $tRun->runPane('scraper', $runVar); @@ -93,14 +93,14 @@ while ($runVar['counts']['iterations'] > 0) { $runVar['constants']['pre_lim'] = ($runVar['counts']['iterations'] > 1 ? '7' : ''); //assign scripts - $runVar['scripts']['releases'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/releases.php"; + $runVar['scripts']['releases'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/releases.php"; switch ((int) $runVar['settings']['binaries_run']) { case 1: - $runVar['scripts']['binaries'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/binaries.php 0"; + $runVar['scripts']['binaries'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/binaries.php 0"; break; case 2: - $runVar['scripts']['binaries'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/safe.php binaries"; + $runVar['scripts']['binaries'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/safe.php binaries"; break; default: $runVar['scripts']['binaries'] = 0; @@ -108,10 +108,10 @@ while ($runVar['counts']['iterations'] > 0) { switch ((int) $runVar['settings']['backfill']) { case 1: - $runVar['scripts']['backfill'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/backfill.php"; + $runVar['scripts']['backfill'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/backfill.php"; break; case 4: - $runVar['scripts']['backfill'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/safe.php backfill"; + $runVar['scripts']['backfill'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/safe.php backfill"; } //get usenet connection counts diff --git a/misc/update/nix/tmux/packages/php7.1-yenc_1.3.0_amd64.deb b/misc/update/tmux/packages/php7.1-yenc_1.3.0_amd64.deb similarity index 100% rename from misc/update/nix/tmux/packages/php7.1-yenc_1.3.0_amd64.deb rename to misc/update/tmux/packages/php7.1-yenc_1.3.0_amd64.deb diff --git a/misc/update/nix/tmux/packages/tmux_1.9-6_amd64.deb b/misc/update/tmux/packages/tmux_1.9-6_amd64.deb similarity index 100% rename from misc/update/nix/tmux/packages/tmux_1.9-6_amd64.deb rename to misc/update/tmux/packages/tmux_1.9-6_amd64.deb diff --git a/misc/update/nix/tmux/packages/tmux_1.9-6_i386.deb b/misc/update/tmux/packages/tmux_1.9-6_i386.deb similarity index 100% rename from misc/update/nix/tmux/packages/tmux_1.9-6_i386.deb rename to misc/update/tmux/packages/tmux_1.9-6_i386.deb diff --git a/misc/update/nix/tmux/packages/tmux_2.0-3_amd64.deb b/misc/update/tmux/packages/tmux_2.0-3_amd64.deb similarity index 100% rename from misc/update/nix/tmux/packages/tmux_2.0-3_amd64.deb rename to misc/update/tmux/packages/tmux_2.0-3_amd64.deb diff --git a/misc/update/nix/tmux/packages/tmux_2.0-3_i386.deb b/misc/update/tmux/packages/tmux_2.0-3_i386.deb similarity index 100% rename from misc/update/nix/tmux/packages/tmux_2.0-3_i386.deb rename to misc/update/tmux/packages/tmux_2.0-3_i386.deb diff --git a/misc/update/nix/tmux/powerline/powerline/.gitignore b/misc/update/tmux/powerline/powerline/.gitignore similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/.gitignore rename to misc/update/tmux/powerline/powerline/.gitignore diff --git a/misc/update/nix/tmux/powerline/powerline/AUTHORS b/misc/update/tmux/powerline/powerline/AUTHORS similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/AUTHORS rename to misc/update/tmux/powerline/powerline/AUTHORS diff --git a/misc/update/nix/tmux/powerline/powerline/LICENSE b/misc/update/tmux/powerline/powerline/LICENSE similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/LICENSE rename to misc/update/tmux/powerline/powerline/LICENSE diff --git a/misc/update/nix/tmux/powerline/powerline/README.md b/misc/update/tmux/powerline/powerline/README.md similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/README.md rename to misc/update/tmux/powerline/powerline/README.md diff --git a/misc/update/nix/tmux/powerline/powerline/color_palette.sh b/misc/update/tmux/powerline/powerline/color_palette.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/color_palette.sh rename to misc/update/tmux/powerline/powerline/color_palette.sh diff --git a/misc/update/nix/tmux/powerline/powerline/config/helpers.sh b/misc/update/tmux/powerline/powerline/config/helpers.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/config/helpers.sh rename to misc/update/tmux/powerline/powerline/config/helpers.sh diff --git a/misc/update/nix/tmux/powerline/powerline/config/paths.sh b/misc/update/tmux/powerline/powerline/config/paths.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/config/paths.sh rename to misc/update/tmux/powerline/powerline/config/paths.sh diff --git a/misc/update/nix/tmux/powerline/powerline/config/shell.sh b/misc/update/tmux/powerline/powerline/config/shell.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/config/shell.sh rename to misc/update/tmux/powerline/powerline/config/shell.sh diff --git a/misc/update/nix/tmux/powerline/powerline/generate_rc.sh b/misc/update/tmux/powerline/powerline/generate_rc.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/generate_rc.sh rename to misc/update/tmux/powerline/powerline/generate_rc.sh diff --git a/misc/update/nix/tmux/powerline/powerline/img/full.png b/misc/update/tmux/powerline/powerline/img/full.png similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/img/full.png rename to misc/update/tmux/powerline/powerline/img/full.png diff --git a/misc/update/nix/tmux/powerline/powerline/img/left-status.png b/misc/update/tmux/powerline/powerline/img/left-status.png similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/img/left-status.png rename to misc/update/tmux/powerline/powerline/img/left-status.png diff --git a/misc/update/nix/tmux/powerline/powerline/img/right-status.png b/misc/update/tmux/powerline/powerline/img/right-status.png similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/img/right-status.png rename to misc/update/tmux/powerline/powerline/img/right-status.png diff --git a/misc/update/nix/tmux/powerline/powerline/img/right-status_no_mail.png b/misc/update/tmux/powerline/powerline/img/right-status_no_mail.png similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/img/right-status_no_mail.png rename to misc/update/tmux/powerline/powerline/img/right-status_no_mail.png diff --git a/misc/update/nix/tmux/powerline/powerline/img/right-status_no_mpd.png b/misc/update/tmux/powerline/powerline/img/right-status_no_mpd.png similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/img/right-status_no_mpd.png rename to misc/update/tmux/powerline/powerline/img/right-status_no_mpd.png diff --git a/misc/update/nix/tmux/powerline/powerline/img/right-status_weather_battery.png b/misc/update/tmux/powerline/powerline/img/right-status_weather_battery.png similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/img/right-status_weather_battery.png rename to misc/update/tmux/powerline/powerline/img/right-status_weather_battery.png diff --git a/misc/update/nix/tmux/powerline/powerline/lib/arg_processing.sh b/misc/update/tmux/powerline/powerline/lib/arg_processing.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/lib/arg_processing.sh rename to misc/update/tmux/powerline/powerline/lib/arg_processing.sh diff --git a/misc/update/nix/tmux/powerline/powerline/lib/formatting.sh b/misc/update/tmux/powerline/powerline/lib/formatting.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/lib/formatting.sh rename to misc/update/tmux/powerline/powerline/lib/formatting.sh diff --git a/misc/update/nix/tmux/powerline/powerline/lib/muting.sh b/misc/update/tmux/powerline/powerline/lib/muting.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/lib/muting.sh rename to misc/update/tmux/powerline/powerline/lib/muting.sh diff --git a/misc/update/nix/tmux/powerline/powerline/lib/ourrcfile.sh b/misc/update/tmux/powerline/powerline/lib/ourrcfile.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/lib/ourrcfile.sh rename to misc/update/tmux/powerline/powerline/lib/ourrcfile.sh diff --git a/misc/update/nix/tmux/powerline/powerline/lib/powerline.sh b/misc/update/tmux/powerline/powerline/lib/powerline.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/lib/powerline.sh rename to misc/update/tmux/powerline/powerline/lib/powerline.sh diff --git a/misc/update/nix/tmux/powerline/powerline/lib/rcfile.sh b/misc/update/tmux/powerline/powerline/lib/rcfile.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/lib/rcfile.sh rename to misc/update/tmux/powerline/powerline/lib/rcfile.sh diff --git a/misc/update/nix/tmux/powerline/powerline/lib/text_roll.sh b/misc/update/tmux/powerline/powerline/lib/text_roll.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/lib/text_roll.sh rename to misc/update/tmux/powerline/powerline/lib/text_roll.sh diff --git a/misc/update/nix/tmux/powerline/powerline/lib/tmux_adapter.sh b/misc/update/tmux/powerline/powerline/lib/tmux_adapter.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/lib/tmux_adapter.sh rename to misc/update/tmux/powerline/powerline/lib/tmux_adapter.sh diff --git a/misc/update/nix/tmux/powerline/powerline/mute_powerline.sh b/misc/update/tmux/powerline/powerline/mute_powerline.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/mute_powerline.sh rename to misc/update/tmux/powerline/powerline/mute_powerline.sh diff --git a/misc/update/nix/tmux/powerline/powerline/powerline.sh b/misc/update/tmux/powerline/powerline/powerline.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/powerline.sh rename to misc/update/tmux/powerline/powerline/powerline.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/Makefile b/misc/update/tmux/powerline/powerline/segments/Makefile similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/Makefile rename to misc/update/tmux/powerline/powerline/segments/Makefile diff --git a/misc/update/nix/tmux/powerline/powerline/segments/battery.sh b/misc/update/tmux/powerline/powerline/segments/battery.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/battery.sh rename to misc/update/tmux/powerline/powerline/segments/battery.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/cpu.sh b/misc/update/tmux/powerline/powerline/segments/cpu.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/cpu.sh rename to misc/update/tmux/powerline/powerline/segments/cpu.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/date.sh b/misc/update/tmux/powerline/powerline/segments/date.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/date.sh rename to misc/update/tmux/powerline/powerline/segments/date.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/date_day.sh b/misc/update/tmux/powerline/powerline/segments/date_day.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/date_day.sh rename to misc/update/tmux/powerline/powerline/segments/date_day.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/earthquake.sh b/misc/update/tmux/powerline/powerline/segments/earthquake.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/earthquake.sh rename to misc/update/tmux/powerline/powerline/segments/earthquake.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/hostname.sh b/misc/update/tmux/powerline/powerline/segments/hostname.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/hostname.sh rename to misc/update/tmux/powerline/powerline/segments/hostname.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/ifstat.sh b/misc/update/tmux/powerline/powerline/segments/ifstat.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/ifstat.sh rename to misc/update/tmux/powerline/powerline/segments/ifstat.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/ifstat_sys.sh b/misc/update/tmux/powerline/powerline/segments/ifstat_sys.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/ifstat_sys.sh rename to misc/update/tmux/powerline/powerline/segments/ifstat_sys.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/lan_ip.sh b/misc/update/tmux/powerline/powerline/segments/lan_ip.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/lan_ip.sh rename to misc/update/tmux/powerline/powerline/segments/lan_ip.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/load.sh b/misc/update/tmux/powerline/powerline/segments/load.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/load.sh rename to misc/update/tmux/powerline/powerline/segments/load.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/mailcount.sh b/misc/update/tmux/powerline/powerline/segments/mailcount.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/mailcount.sh rename to misc/update/tmux/powerline/powerline/segments/mailcount.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/mailcount_apple_mail.script b/misc/update/tmux/powerline/powerline/segments/mailcount_apple_mail.script similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/mailcount_apple_mail.script rename to misc/update/tmux/powerline/powerline/segments/mailcount_apple_mail.script diff --git a/misc/update/nix/tmux/powerline/powerline/segments/now_playing.sh b/misc/update/tmux/powerline/powerline/segments/now_playing.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/now_playing.sh rename to misc/update/tmux/powerline/powerline/segments/now_playing.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/np_itunes.script b/misc/update/tmux/powerline/powerline/segments/np_itunes.script similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/np_itunes.script rename to misc/update/tmux/powerline/powerline/segments/np_itunes.script diff --git a/misc/update/nix/tmux/powerline/powerline/segments/np_mpd.c b/misc/update/tmux/powerline/powerline/segments/np_mpd.c similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/np_mpd.c rename to misc/update/tmux/powerline/powerline/segments/np_mpd.c diff --git a/misc/update/nix/tmux/powerline/powerline/segments/np_pithos.py b/misc/update/tmux/powerline/powerline/segments/np_pithos.py similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/np_pithos.py rename to misc/update/tmux/powerline/powerline/segments/np_pithos.py diff --git a/misc/update/nix/tmux/powerline/powerline/segments/np_rdio_mac.script b/misc/update/tmux/powerline/powerline/segments/np_rdio_mac.script similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/np_rdio_mac.script rename to misc/update/tmux/powerline/powerline/segments/np_rdio_mac.script diff --git a/misc/update/nix/tmux/powerline/powerline/segments/np_spotify_mac.script b/misc/update/tmux/powerline/powerline/segments/np_spotify_mac.script similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/np_spotify_mac.script rename to misc/update/tmux/powerline/powerline/segments/np_spotify_mac.script diff --git a/misc/update/nix/tmux/powerline/powerline/segments/pwd.sh b/misc/update/tmux/powerline/powerline/segments/pwd.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/pwd.sh rename to misc/update/tmux/powerline/powerline/segments/pwd.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/rainbarf.sh b/misc/update/tmux/powerline/powerline/segments/rainbarf.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/rainbarf.sh rename to misc/update/tmux/powerline/powerline/segments/rainbarf.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/time.sh b/misc/update/tmux/powerline/powerline/segments/time.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/time.sh rename to misc/update/tmux/powerline/powerline/segments/time.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/tmux_mem_cpu_load.sh b/misc/update/tmux/powerline/powerline/segments/tmux_mem_cpu_load.sh similarity index 75% rename from misc/update/nix/tmux/powerline/powerline/segments/tmux_mem_cpu_load.sh rename to misc/update/tmux/powerline/powerline/segments/tmux_mem_cpu_load.sh index b7dfc3a39..d5393261c 100644 --- a/misc/update/nix/tmux/powerline/powerline/segments/tmux_mem_cpu_load.sh +++ b/misc/update/tmux/powerline/powerline/segments/tmux_mem_cpu_load.sh @@ -1,5 +1,5 @@ # Print out Memory, cpu and load using https://github.com/thewtex/tmux-mem-cpu-load -mem_app=$(php ../../../../NNBase.php)/misc/update/nix/tmux/bin/tmux-mem-cpu-load +mem_app=$(php ../../../../NNBase.php)/misc/update/tmux/bin/tmux-mem-cpu-load run_segment() { type $mem_app >/dev/null 2>&1 if [ "$?" -ne 0 ]; then diff --git a/misc/update/nix/tmux/powerline/powerline/segments/tmux_session_info.sh b/misc/update/tmux/powerline/powerline/segments/tmux_session_info.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/tmux_session_info.sh rename to misc/update/tmux/powerline/powerline/segments/tmux_session_info.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/uptime.sh b/misc/update/tmux/powerline/powerline/segments/uptime.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/uptime.sh rename to misc/update/tmux/powerline/powerline/segments/uptime.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/uspsetting.sh b/misc/update/tmux/powerline/powerline/segments/uspsetting.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/uspsetting.sh rename to misc/update/tmux/powerline/powerline/segments/uspsetting.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/utc_time.sh b/misc/update/tmux/powerline/powerline/segments/utc_time.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/utc_time.sh rename to misc/update/tmux/powerline/powerline/segments/utc_time.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/vcs_branch.sh b/misc/update/tmux/powerline/powerline/segments/vcs_branch.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/vcs_branch.sh rename to misc/update/tmux/powerline/powerline/segments/vcs_branch.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/vcs_branch_NN.sh b/misc/update/tmux/powerline/powerline/segments/vcs_branch_NN.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/vcs_branch_NN.sh rename to misc/update/tmux/powerline/powerline/segments/vcs_branch_NN.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/vcs_compare.sh b/misc/update/tmux/powerline/powerline/segments/vcs_compare.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/vcs_compare.sh rename to misc/update/tmux/powerline/powerline/segments/vcs_compare.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/vcs_compare_NN.sh b/misc/update/tmux/powerline/powerline/segments/vcs_compare_NN.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/vcs_compare_NN.sh rename to misc/update/tmux/powerline/powerline/segments/vcs_compare_NN.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/vcs_modified.sh b/misc/update/tmux/powerline/powerline/segments/vcs_modified.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/vcs_modified.sh rename to misc/update/tmux/powerline/powerline/segments/vcs_modified.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/vcs_others.sh b/misc/update/tmux/powerline/powerline/segments/vcs_others.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/vcs_others.sh rename to misc/update/tmux/powerline/powerline/segments/vcs_others.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/vcs_revision.sh b/misc/update/tmux/powerline/powerline/segments/vcs_revision.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/vcs_revision.sh rename to misc/update/tmux/powerline/powerline/segments/vcs_revision.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/vcs_staged.sh b/misc/update/tmux/powerline/powerline/segments/vcs_staged.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/vcs_staged.sh rename to misc/update/tmux/powerline/powerline/segments/vcs_staged.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/wan_ip.sh b/misc/update/tmux/powerline/powerline/segments/wan_ip.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/wan_ip.sh rename to misc/update/tmux/powerline/powerline/segments/wan_ip.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/weather.sh b/misc/update/tmux/powerline/powerline/segments/weather.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/weather.sh rename to misc/update/tmux/powerline/powerline/segments/weather.sh diff --git a/misc/update/nix/tmux/powerline/powerline/segments/xkb_layout.c b/misc/update/tmux/powerline/powerline/segments/xkb_layout.c similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/xkb_layout.c rename to misc/update/tmux/powerline/powerline/segments/xkb_layout.c diff --git a/misc/update/nix/tmux/powerline/powerline/segments/xkb_layout.sh b/misc/update/tmux/powerline/powerline/segments/xkb_layout.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/segments/xkb_layout.sh rename to misc/update/tmux/powerline/powerline/segments/xkb_layout.sh diff --git a/misc/update/nix/tmux/powerline/powerline/themes/.gitignore b/misc/update/tmux/powerline/powerline/themes/.gitignore similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/themes/.gitignore rename to misc/update/tmux/powerline/powerline/themes/.gitignore diff --git a/misc/update/nix/tmux/powerline/powerline/themes/default.sh b/misc/update/tmux/powerline/powerline/themes/default.sh similarity index 100% rename from misc/update/nix/tmux/powerline/powerline/themes/default.sh rename to misc/update/tmux/powerline/powerline/themes/default.sh diff --git a/misc/update/nix/tmux/powerline/tmux.conf b/misc/update/tmux/powerline/tmux.conf similarity index 100% rename from misc/update/nix/tmux/powerline/tmux.conf rename to misc/update/tmux/powerline/tmux.conf diff --git a/misc/update/nix/tmux/powerline/tmux_ge_2.3.conf b/misc/update/tmux/powerline/tmux_ge_2.3.conf similarity index 100% rename from misc/update/nix/tmux/powerline/tmux_ge_2.3.conf rename to misc/update/tmux/powerline/tmux_ge_2.3.conf diff --git a/misc/update/nix/tmux/powerline/tmux_le_2.0.conf b/misc/update/tmux/powerline/tmux_le_2.0.conf similarity index 100% rename from misc/update/nix/tmux/powerline/tmux_le_2.0.conf rename to misc/update/tmux/powerline/tmux_le_2.0.conf diff --git a/misc/update/nix/tmux/run.php b/misc/update/tmux/run.php similarity index 100% rename from misc/update/nix/tmux/run.php rename to misc/update/tmux/run.php diff --git a/misc/update/nix/tmux/scripts/mysqlreport b/misc/update/tmux/scripts/mysqlreport similarity index 100% rename from misc/update/nix/tmux/scripts/mysqlreport rename to misc/update/tmux/scripts/mysqlreport diff --git a/misc/update/nix/tmux/scripts/mysqltuner.pl b/misc/update/tmux/scripts/mysqltuner.pl similarity index 100% rename from misc/update/nix/tmux/scripts/mysqltuner.pl rename to misc/update/tmux/scripts/mysqltuner.pl diff --git a/misc/update/nix/tmux/scripts/tuning-primer.sh b/misc/update/tmux/scripts/tuning-primer.sh similarity index 100% rename from misc/update/nix/tmux/scripts/tuning-primer.sh rename to misc/update/tmux/scripts/tuning-primer.sh diff --git a/misc/update/nix/tmux/start.php b/misc/update/tmux/start.php similarity index 100% rename from misc/update/nix/tmux/start.php rename to misc/update/tmux/start.php diff --git a/misc/update/nix/tmux/stop.php b/misc/update/tmux/stop.php similarity index 100% rename from misc/update/nix/tmux/stop.php rename to misc/update/tmux/stop.php diff --git a/misc/update/nix/tmux/tmux.conf b/misc/update/tmux/tmux.conf similarity index 100% rename from misc/update/nix/tmux/tmux.conf rename to misc/update/tmux/tmux.conf diff --git a/misc/update/nix/tmux/tmux_ge_2.3.conf b/misc/update/tmux/tmux_ge_2.3.conf similarity index 100% rename from misc/update/nix/tmux/tmux_ge_2.3.conf rename to misc/update/tmux/tmux_ge_2.3.conf diff --git a/misc/update/nix/tmux/tmux_le_2.0.conf b/misc/update/tmux/tmux_le_2.0.conf similarity index 100% rename from misc/update/nix/tmux/tmux_le_2.0.conf rename to misc/update/tmux/tmux_le_2.0.conf diff --git a/nntmux/TmuxRun.php b/nntmux/TmuxRun.php index 921b92b0d..a65a2f361 100755 --- a/nntmux/TmuxRun.php +++ b/nntmux/TmuxRun.php @@ -165,7 +165,7 @@ class TmuxRun extends Tmux case 2: $log = $this->writelog($runVar['panes']['one'][3]); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.3 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/tmux/bin/postprocess_pre.php {$runVar['constants']['pre_lim']} $log; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/tmux/bin/postprocess_pre.php {$runVar['constants']['pre_lim']} $log; \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/match_prefiles.php 10240 show $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['dehash_timer']}' 2>&1 1> /dev/null" ); @@ -173,7 +173,7 @@ class TmuxRun extends Tmux case 3: $log = $this->writelog($runVar['panes']['one'][3]); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.3 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/tmux/bin/postprocess_pre.php {$runVar['constants']['pre_lim']} $log; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/tmux/bin/postprocess_pre.php {$runVar['constants']['pre_lim']} $log; \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/decrypt_hashes.php 1000 $log; \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/match_prefiles.php 10240 show $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['dehash_timer']}' 2>&1 1> /dev/null" @@ -194,8 +194,8 @@ class TmuxRun extends Tmux if ($runVar['counts']['now']['processrenames'] > 0) { $log = $this->writelog($runVar['panes']['one'][0]); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.0 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/fixrelnames.php standard $log; \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/fixrelnames.php predbft $log; date +\"{$this->_dateFormat}\"; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/fixrelnames.php standard $log; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/fixrelnames.php predbft $log; date +\"{$this->_dateFormat}\"; \ {$runVar['commands']['_sleep']} {$runVar['settings']['fix_timer']}' 2>&1 1> /dev/null" ); } else { @@ -307,8 +307,8 @@ class TmuxRun extends Tmux case (int) $runVar['settings']['post_non'] !== 0 && ((int) $runVar['counts']['now']['processmovies'] > 0 || (int) $runVar['counts']['now']['processtv'] > 0 || $runVar['counts']['now']['processanime'] > 0): $log = $this->writelog($runVar['panes']['two'][1]); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.1 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/postprocess.php tv $log; \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/postprocess.php mov $log; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/postprocess.php tv $log; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/postprocess.php mov $log; \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/postprocess.php anime true $log; \ {$runVar['commands']['_php']} {$runVar['paths']['misc']}testing/PostProc/check_covers.php true $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer_non']}' 2>&1 1> /dev/null" @@ -408,7 +408,7 @@ class TmuxRun extends Tmux if (((int) $runVar['settings']['import'] !== 0) && ($runVar['killswitch']['pp'] === false)) { $log = $this->writelog($runVar['panes']['zero'][1]); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.1 ' \ - {$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update/nix/multiprocessing/import.php {$runVar['settings']['nzbs']} {$runVar['settings']['nzbthreads']} true true {$useFilenames} {$runVar['settings']['import_count']} $log; \ + {$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update/multiprocessing/import.php {$runVar['settings']['nzbs']} {$runVar['settings']['nzbthreads']} true true {$useFilenames} {$runVar['settings']['import_count']} $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['import_timer']}' 2>&1 1> /dev/null" ); } elseif ($runVar['killswitch']['pp'] === true) { @@ -431,14 +431,14 @@ class TmuxRun extends Tmux $log = $this->writelog($runVar['panes']['two'][0]); $color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.0 'echo \"\033[38;5;${color}m\"; \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/postprocess.php add $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer']}' 2>&1 1> /dev/null" + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/postprocess.php add $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer']}' 2>&1 1> /dev/null" ); $runVar['timers']['timer3'] = time(); break; case ((int) $runVar['settings']['post'] === 2) && ((int) $runVar['counts']['now']['processnfo'] > 0): $log = $this->writelog($runVar['panes']['two'][0]); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.0 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/postprocess.php nfo $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer']}' 2>&1 1> /dev/null" + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/postprocess.php nfo $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer']}' 2>&1 1> /dev/null" ); $runVar['timers']['timer3'] = time(); break; @@ -446,8 +446,8 @@ class TmuxRun extends Tmux //run postprocess_releases additional $log = $this->writelog($runVar['panes']['two'][0]); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.0 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/postprocess.php add $log; \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/postprocess.php nfo $log; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/postprocess.php add $log; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/postprocess.php nfo $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer']}' 2>&1 1> /dev/null" ); $runVar['timers']['timer3'] = time(); @@ -635,7 +635,7 @@ class TmuxRun extends Tmux //run backfill all once and resets the timer if ((int) $runVar['settings']['backfill'] !== 0) { shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.2 ' \ - {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/nix/multiprocessing/backfill.php $log; \ + {$runVar['commands']['_php']} {$runVar['paths']['misc']}update/multiprocessing/backfill.php $log; \ date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['seq_timer']}' 2>&1 1> /dev/null" ); $runVar['timers']['timer5'] = time(); @@ -662,7 +662,7 @@ class TmuxRun extends Tmux { $log = $this->writelog($runVar['panes']['zero'][2]); shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.2 ' \ - {$runVar['paths']['misc']}update/nix/screen/sequential/user_threaded.sh true $log; date +\"{$this->_dateFormat}\"' 2>&1 1> /dev/null" + {$runVar['paths']['misc']}update/screen/sequential/user_threaded.sh true $log; date +\"{$this->_dateFormat}\"' 2>&1 1> /dev/null" ); } diff --git a/nntmux/constants.php b/nntmux/constants.php index ec9313af9..01c1a5280 100755 --- a/nntmux/constants.php +++ b/nntmux/constants.php @@ -26,17 +26,14 @@ define('NN_MISC', NN_ROOT.'misc'.DS); // /misc/update/ define('NN_UPDATE', NN_MISC.'update'.DS); -// /misc/update/nix/ -define('NN_NIX', NN_UPDATE.'nix'.DS); - -// /misc/update/nix/multiprocessing +// /misc/update/multiprocessing define('NN_MULTI', NN_UPDATE.'nix'.DS.'multiprocessing'.DS); -// /misc/update/nix/tmux/ +// /misc/update/tmux/ define('NN_TMUX', NN_UPDATE.'nix'.DS.'tmux'.DS); -// /misc/update/nix/multiprocessing/ -define('NN_MULTIPROCESSING', NN_NIX.'multiprocessing'.DS); +// /misc/update/multiprocessing/ +define('NN_MULTIPROCESSING', NN_UPDATE.'multiprocessing'.DS); // Refers to the web root for the Smarty lib define('NN_WWW', NN_ROOT.'public'.DS); diff --git a/nntmux/libraries/Forking.php b/nntmux/libraries/Forking.php index abb2eb40a..ce72d9398 100755 --- a/nntmux/libraries/Forking.php +++ b/nntmux/libraries/Forking.php @@ -313,7 +313,7 @@ class Forking extends \fork_daemon case 'safe_backfill': case 'safe_binaries': $this->_executeCommand( - PHP_BINARY.' '.NN_NIX.'tmux/bin/update_groups.php' + PHP_BINARY.' '.NN_UPDATE.'tmux/bin/update_groups.php' ); break; } @@ -643,7 +643,7 @@ class Forking extends \fork_daemon { foreach ($guids as $guid) { $this->_executeCommand( - PHP_BINARY.' '.NN_NIX.'tmux/bin/groupfixrelnames.php "'.$guid.'"'.' true' + PHP_BINARY.' '.NN_UPDATE.'tmux/bin/groupfixrelnames.php "'.$guid.'"'.' true' ); } } diff --git a/nntmux/processing/ProcessReleases.php b/nntmux/processing/ProcessReleases.php index 68c7f5561..e066af82e 100755 --- a/nntmux/processing/ProcessReleases.php +++ b/nntmux/processing/ProcessReleases.php @@ -229,7 +229,7 @@ class ProcessReleases if ($this->echoCLI) { ColorCLI::doEcho(ColorCLI::header('Process Releases -> Request ID Threaded lookup.')); } - passthru("${DIR}update/nix/multiprocessing/requestid.php"); + passthru("${DIR}update/multiprocessing/requestid.php"); if ($this->echoCLI) { ColorCLI::doEcho( ColorCLI::primary( diff --git a/public/themes/admin/index.tpl b/public/themes/admin/index.tpl index f71fab8dd..ae8cfc2cd 100644 --- a/public/themes/admin/index.tpl +++ b/public/themes/admin/index.tpl @@ -11,10 +11,10 @@
  • Configure your site options. The defaults will work fine.
  • There is a default list of usenet groups provided. To get started, you will need to activate some groups. Do not activate every group if its your first time setting this up. Try one or two first. You can also add your own groups manually.
    • -
  • Next you will want to get the latest headers. This should be done from the command line, using the linux or windows shell scripts found in /misc/update/nix (or win for windows users), as it can take some time. If this is your first time dont bother with the init scripts just open a command prompt... +
  • Next you will want to get the latest headers. This should be done from the command line, using the linux or windows shell scripts found in /misc/update (or win for windows users), as it can take some time. If this is your first time dont bother with the init scripts just open a command prompt...
    cd /var/www/newznab/misc/update
    php update_binaries.php
    • -
  • After obtaining headers, the next step is to create releases. This is best done from the command line using the linux or windows shell scripts found in /misc/update/nix (or win for windows users). If this is your first time dont bother with the init scripts just open a command prompt... +
  • After obtaining headers, the next step is to create releases. This is best done from the command line using the linux or windows shell scripts found in /misc/update (or win for windows users). If this is your first time dont bother with the init scripts just open a command prompt...
    cd /var/www/newznab/misc/update
    php update_releases.php
  • If you intend to keep using newznab, it is best to sign up for your own api keys from tmdb, rotten tomatoes and amazon.