From 75167bb5768454ed05b26b691ed7f4f2a793aa99 Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 6 Mar 2011 15:18:40 -0500 Subject: [PATCH] -syntax error fix for liquidsoap + other small changes --- install/airtime-install.php | 5 ++--- pypo/scripts/lib.liq | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/install/airtime-install.php b/install/airtime-install.php index 885c2d36a..68913f554 100644 --- a/install/airtime-install.php +++ b/install/airtime-install.php @@ -18,7 +18,6 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) { createAPIKey(); require_once(dirname(__FILE__).'/../application/configs/conf.php'); -//require_once(dirname(__FILE__).'/../application/models/GreenBox.php'); require_once(dirname(__FILE__).'/installInit.php'); @@ -36,8 +35,8 @@ function rand_string($len=20, $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') function createAPIKey(){ $api_key = rand_string(); - updateINIKeyValues('../build/airtime.conf', 'api_key', $api_key); - updateINIKeyValues('../pypo/config.cfg', 'api_key', "'$api_key'"); + updateINIKeyValues(__DIR__.'/../build/airtime.conf', 'api_key', $api_key); + updateINIKeyValues(__DIR__.'/../pypo/config.cfg', 'api_key', "'$api_key'"); } function checkIfRoot(){ diff --git a/pypo/scripts/lib.liq b/pypo/scripts/lib.liq index 384287056..2dc107c14 100644 --- a/pypo/scripts/lib.liq +++ b/pypo/scripts/lib.liq @@ -42,7 +42,7 @@ def add_skip_command(s) def skip(_) l = list.hd(server.execute("queue.queue")) l = string.split(separator=" ",l) - list.iter(fun (rid) -> ignore(server.execute(queue.ignore #{rid}")), l) + list.iter(fun (rid) -> ignore(server.execute("queue.ignore #{rid}")), l) source.skip(s) "Done!"