From 0d77087ea4e5ae06b2e4358e5bcc14941fd10398 Mon Sep 17 00:00:00 2001
From: Darko <dkrisan@gmail.com>
Date: Fri, 26 Sep 2014 15:30:50 +0200
Subject: [PATCH] Fix for safe binaries.

---
 bin/monitor.php                               |  4 ++--
 bin/update_binaries.php                       |  2 +-
 lib/copy_this/misc/update_scripts/config.php  |  3 +++
 .../multiprocessing/.do_not_run/switch.php    |  2 +-
 .../misc/update_scripts/update_binaries.php   | 22 +++++++++++++++++++
 5 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 lib/copy_this/misc/update_scripts/config.php
 create mode 100644 lib/copy_this/misc/update_scripts/update_binaries.php

diff --git a/bin/monitor.php b/bin/monitor.php
index 560cad647..59671187c 100644
--- a/bin/monitor.php
+++ b/bin/monitor.php
@@ -1274,10 +1274,10 @@ while ($i > 0) {
 		$_update_cmd = "cd $_bin && $_php update_binaries.php 2>&1 $log";
 	} else if ($binaries == 2) {
 		$log = writelog($panes0[2]);
-		$_update_cmd = "$_python ${DIR}/../python/binaries_threaded.py 2>&1 $log";
+		$_update_cmd = "$_php ${DIR}/../../multiprocessing/binaries.php 0 2>&1 $log";
 	} else if ($binaries == 3) {
 		$log = writelog($panes0[2]);
-		$_update_cmd = "$_python ${DIR}/../python/binaries_safe_threaded.py 2>&1 $log";
+		$_update_cmd = "$_php ${DIR}/../../multiprocessing/safe.php binaries 2>&1 $log";
 	}
 
 	if ($releases_run != 0) {
diff --git a/bin/update_binaries.php b/bin/update_binaries.php
index 479ec2259..89aa3092f 100644
--- a/bin/update_binaries.php
+++ b/bin/update_binaries.php
@@ -1,6 +1,6 @@
 <?php
 
-require(dirname(__FILE__) . "/config.php");
+require_once(dirname(__FILE__) . "/config.php");
 require_once(WWW_DIR . "/lib/groups.php");
 require_once(WWW_DIR . "/lib/binaries.php");
 require_once(WWW_DIR . "/lib/ColorCLI.php");
diff --git a/lib/copy_this/misc/update_scripts/config.php b/lib/copy_this/misc/update_scripts/config.php
new file mode 100644
index 000000000..04d450851
--- /dev/null
+++ b/lib/copy_this/misc/update_scripts/config.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once(dirname(__FILE__) . "../../www/config.php");
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php
index 60afbb23b..a0bf9caca 100644
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php
+++ b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php
@@ -188,7 +188,7 @@ switch ($options[1]) {
 		$nntp = nntp($pdo);
 		$groups = new \Groups();
 		$groupMySQL = $groups->getByName($options[2]);
-		(new \Binaries())->updateGroup($groupMySQL);
+		(new \Binaries())->updateGroup($nntp, $groupMySQL);
 		break;
 
 
diff --git a/lib/copy_this/misc/update_scripts/update_binaries.php b/lib/copy_this/misc/update_scripts/update_binaries.php
new file mode 100644
index 000000000..9101f4993
--- /dev/null
+++ b/lib/copy_this/misc/update_scripts/update_binaries.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once(dirname(__FILE__) . "/config.php");
+require_once(WWW_DIR."/lib/groups.php");
+require_once(WWW_DIR."/lib/binaries.php");
+
+if (isset($argv[1]))
+{
+	$group = $argv[1];
+	echo "Updating group {$group}\n";
+
+	$g = new Groups;
+	$group = $g->getByName($group);
+
+	$bin = new Binaries;
+	$bin->updateGroup(null, $group);
+}
+else
+{
+	$binaries = new Binaries;
+	$binaries->updateAllGroups();
+}
\ No newline at end of file