From 4380ab94342fe234c39d7b27240c69c175d33cb8 Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Mon, 18 May 2020 14:52:48 +0200 Subject: [PATCH 1/4] Force fixed strings on grep for media-monitor Fixes removing the config file on re-running install --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index ae2b8a870..1b5b89c20 100755 --- a/install +++ b/install @@ -768,7 +768,7 @@ loudCmd "./build.sh" if [ -f /etc/airtime/airtime.conf ]; then # TODO use VERSION or some other way to check for updates and handle # media-monitor case on it's own - OLD_CONF=$(grep "[media-monitor]" /etc/airtime/airtime.conf) + OLD_CONF=$(grep -F "[media-monitor]" /etc/airtime/airtime.conf || true) if [ -n "${OLD_CONF}" ]; then upgrade="t" From ad28c7de997d5ae54024655d37d50c0c7e8a7eac Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Mon, 23 Nov 2020 15:38:06 -0500 Subject: [PATCH 2/4] Add our PPA to Ubuntu installs --- install | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install b/install index fb4ce7b3f..0ff909929 100755 --- a/install +++ b/install @@ -711,10 +711,14 @@ if [ "$ignore_dependencies" = "f" ]; then loud "\n-----------------------------------------------------" loud " * Installing External Dependencies * " loud "-----------------------------------------------------" + + if [ $is_ubuntu_dist ]; then + loudCmd "add-apt-repository -y ppa:libretime/libretime" + fi if [ -x /usr/bin/apt-get ]; then verbose "\n * Reading requirements-${dist}-${code}.apt..." - loudCmd "apt-get update" + loudCmd "apt-get -q update" package_list_file="${SCRIPT_DIR}/installer/lib/requirements-${dist}-${code}.apt" if [ ! -f "$package_list_file" ]; then echo "ERROR: package file does not exist: $package_list_file" >&2 From b8f4a3392716b5be2ab89139cc5b65b973dec523 Mon Sep 17 00:00:00 2001 From: Valerio Bozzolan Date: Sat, 28 Nov 2020 18:47:56 +0100 Subject: [PATCH 3/4] Fix HTML iframe tag in EmbedController(s) and adopt relative URLs This changeset fixes this issue: * https://github.com/LibreTime/libretime/issues/988 This changeset contributes in fixing this issue: * https://github.com/LibreTime/libretime/issues/957 --- .../controllers/EmbedController.php | 26 +++++++++---------- .../views/scripts/index/index.phtml | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/airtime_mvc/application/controllers/EmbedController.php b/airtime_mvc/application/controllers/EmbedController.php index e411b3feb..c7684ba45 100644 --- a/airtime_mvc/application/controllers/EmbedController.php +++ b/airtime_mvc/application/controllers/EmbedController.php @@ -25,18 +25,18 @@ class EmbedController extends Zend_Controller_Action $request = $this->getRequest(); - $this->view->playerhtml5_js = Application_Common_HTTPHelper::getStationUrl() . "js/airtime/player/playerhtml5.js?".$CC_CONFIG['airtime_version']; - $this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "js/libs/jquery-1.10.2.js"; - $this->view->metadata_api_url = Application_Common_HTTPHelper::getStationUrl() . "api/live-info"; + $this->view->playerhtml5_js = "/js/airtime/player/playerhtml5.js?".$CC_CONFIG['airtime_version']; + $this->view->jquery = "/js/libs/jquery-1.10.2.js"; + $this->view->metadata_api_url = "/api/live-info"; $this->view->player_title = json_encode($this->view->escape($request->getParam('title'))); - $this->view->jquery_i18n = Application_Common_HTTPHelper::getStationUrl() . "js/i18n/jquery.i18n.js?"; + $this->view->jquery_i18n = "/js/i18n/jquery.i18n.js?"; $styleParam = $request->getParam('style'); $player_style = isset($styleParam) ? $styleParam : "basic"; if ($player_style == "premium") { - $this->view->css = Application_Common_HTTPHelper::getStationUrl() . "css/radio-page/premium_player.css?".$CC_CONFIG['airtime_version']; + $this->view->css = "/css/radio-page/premium_player.css?".$CC_CONFIG['airtime_version']; } else { - $this->view->css = Application_Common_HTTPHelper::getStationUrl() . "css/player.css?".$CC_CONFIG['airtime_version']; + $this->view->css = "/css/player.css?".$CC_CONFIG['airtime_version']; } $this->view->player_style = $player_style; @@ -75,10 +75,10 @@ class EmbedController extends Zend_Controller_Action $CC_CONFIG = Config::getConfig(); - $this->view->css = Application_Common_HTTPHelper::getStationUrl() . "widgets/css/airtime-widgets.css?".$CC_CONFIG['airtime_version']; - $this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version']; - $this->view->jquery_custom = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery-ui-1.8.10.custom.min.js?".$CC_CONFIG['airtime_version']; - $this->view->widget_js = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery.showinfo.js?".$CC_CONFIG['airtime_version']; + $this->view->css = "/widgets/css/airtime-widgets.css?".$CC_CONFIG['airtime_version']; + $this->view->jquery = "/widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version']; + $this->view->jquery_custom = "/widgets/js/jquery-ui-1.8.10.custom.min.js?".$CC_CONFIG['airtime_version']; + $this->view->widget_js = "/widgets/js/jquery.showinfo.js?".$CC_CONFIG['airtime_version']; } public function weeklyProgramAction() @@ -93,12 +93,12 @@ class EmbedController extends Zend_Controller_Action $widgetStyle = $request->getParam('style'); if ($widgetStyle == "premium") { $this->view->widgetStyle = "premium"; - $this->view->css = Application_Common_HTTPHelper::getStationUrl() . "/css/embed/weekly-schedule-widget.css?" . $CC_CONFIG['airtime_version']; + $this->view->css = "/css/embed/weekly-schedule-widget.css?" . $CC_CONFIG['airtime_version']; } else { $this->view->widgetStyle = "basic"; - $this->view->css = Application_Common_HTTPHelper::getStationUrl() . "/css/embed/weekly-schedule-widget-basic.css?" . $CC_CONFIG['airtime_version']; + $this->view->css = "/css/embed/weekly-schedule-widget-basic.css?" . $CC_CONFIG['airtime_version']; } - $this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version']; + $this->view->jquery = "/widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version']; $weeklyScheduleData = WidgetHelper::getWeekInfoV2(); diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml index 851430bde..d80a3660a 100644 --- a/airtime_mvc/application/views/scripts/index/index.phtml +++ b/airtime_mvc/application/views/scripts/index/index.phtml @@ -34,7 +34,7 @@
- +
@@ -299,7 +299,7 @@ } ?> - + From 4d857066227b9c0aa244a570c440ac8142bbd1cd Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Mon, 30 Nov 2020 22:38:16 +0100 Subject: [PATCH 4/4] chore(dependabot): remove docs Gemfile.lock Ensure we are minimally impacted by upstream toolchain changes. --- docs/Gemfile.lock | 68 ----------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 docs/Gemfile.lock diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock deleted file mode 100644 index 36c00c0f1..000000000 --- a/docs/Gemfile.lock +++ /dev/null @@ -1,68 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - colorator (1.1.0) - concurrent-ruby (1.1.6) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - eventmachine (1.2.7) - ffi (1.13.1) - forwardable-extended (2.6.0) - http_parser.rb (0.6.0) - i18n (1.8.3) - concurrent-ruby (~> 1.0) - jekyll (4.1.0) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) - jekyll-watch (~> 2.0) - kramdown (~> 2.1) - kramdown-parser-gfm (~> 1.0) - liquid (~> 4.0) - mercenary (~> 0.4.0) - pathutil (~> 0.9) - rouge (~> 3.0) - safe_yaml (~> 1.0) - terminal-table (~> 1.8) - jekyll-sass-converter (2.1.0) - sassc (> 2.0.1, < 3.0) - jekyll-watch (2.2.1) - listen (~> 3.0) - kramdown (2.2.1) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - liquid (4.0.3) - listen (3.2.1) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.4.0) - pathutil (0.16.2) - forwardable-extended (~> 2.6) - public_suffix (4.0.5) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) - ffi (~> 1.0) - rexml (3.2.4) - rouge (3.20.0) - safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.7.0) - -PLATFORMS - ruby - -DEPENDENCIES - jekyll (~> 4.1) - kramdown (~> 2.2, >= 2.2.1) - -BUNDLED WITH - 2.1.4