From d8195f0fd89dd23e95e1b2276e4b940236a885df Mon Sep 17 00:00:00 2001 From: jo Date: Thu, 27 May 2021 16:33:20 +0200 Subject: [PATCH] Fix trailing whitespaces in files --- CREDITS | 88 +++++++++---------- changelog | 78 ++++++++-------- dev_tools/README_TRANSLATIONS | 2 +- dev_tools/auto_schedule_show.php | 46 +++++----- dev_tools/compare_cc_files_to_fs.py | 2 +- .../liquidsoap_compile/liquidsoap-compile.sh | 2 +- dev_tools/liquidsoap_compile/run.sh | 8 +- dev_tools/release/release.sh | 2 +- dev_tools/scripts/git-config-git-merge-po | 2 +- dev_tools/scripts/git-merge-po | 8 +- dev_tools/toggle-pypo-debug.sh | 4 +- docs/_includes/head.html | 6 +- docs/_includes/navbar.html | 2 +- docs/_includes/scripts.html | 7 +- docs/_layouts/article.html | 6 +- docs/_layouts/default.html | 8 +- docs/_layouts/home.html | 6 +- docs/css/creative.min.css | 50 +++++------ docs/docs.html | 2 +- docs/search.html | 2 +- installer/lxc-bootstrap | 2 +- installer/vagrant/centos.sh | 4 +- logo/logotype.ai | 8 +- .../airtime_analyzer/message_listener.py | 30 +++---- .../airtime_analyzer/status_reporter.py | 8 +- .../airtime_analyzer/tools/ftp-upload-hook.sh | 16 ++-- .../airtime_analyzer/tools/message_sender.php | 8 +- .../tools/test-hook-script.sh | 2 +- python_apps/pypo/liquidsoap/1.1/fdkaac.liq | 2 +- python_apps/pypo/liquidsoap/1.1/ls_lib.liq | 10 +-- python_apps/pypo/liquidsoap/1.1/ls_script.liq | 8 +- python_apps/pypo/liquidsoap/1.1/mp3.liq | 2 +- python_apps/pypo/liquidsoap/1.1/ogg.liq | 2 +- python_apps/pypo/liquidsoap/1.1/opus.liq | 2 +- python_apps/pypo/liquidsoap/1.3/fdkaac.liq | 2 +- python_apps/pypo/liquidsoap/1.3/ls_lib.liq | 10 +-- python_apps/pypo/liquidsoap/1.3/ls_script.liq | 8 +- python_apps/pypo/liquidsoap/1.3/mp3.liq | 2 +- python_apps/pypo/liquidsoap/1.3/ogg.liq | 2 +- python_apps/pypo/liquidsoap/1.3/opus.liq | 2 +- python_apps/pypo/liquidsoap/1.4/fdkaac.liq | 2 +- python_apps/pypo/liquidsoap/1.4/mp3.liq | 2 +- python_apps/pypo/liquidsoap/1.4/ogg.liq | 2 +- python_apps/pypo/liquidsoap/1.4/opus.liq | 2 +- utils/airtime-log.php | 10 +-- utils/rivendell-converter.sh | 2 +- 46 files changed, 240 insertions(+), 241 deletions(-) diff --git a/CREDITS b/CREDITS index ad4150f37..984f42413 100644 --- a/CREDITS +++ b/CREDITS @@ -92,7 +92,7 @@ Martin Konecny (martin.konecny@sourcefabric.org) James Moon (james.moon@sourcefabric.org) Role: Software Developer - + Denise Rigato (denise.rigato@sourcefabric.org) Role: Software Developer @@ -124,7 +124,7 @@ Martin Konecny (martin.konecny@sourcefabric.org) James Moon (james.moon@sourcefabric.org) Role: Software Developer - + Denise Rigato (denise.rigato@sourcefabric.org) Role: Software Developer @@ -147,7 +147,7 @@ Naomi Aro (naomi.aro@sourcefabric.org) James Moon (james.moon@sourcefabric.org) Role: Software Developer - + Denise Rigato (denise.rigato@sourcefabric.org) Role: Software Developer @@ -198,7 +198,7 @@ Naomi Aro (naomi.aro@sourcefabric.org) James Moon (james.moon@sourcefabric.org) Role: Software Developer - + Denise Rigato (denise.rigato@sourcefabric.org) Role: Software Developer @@ -267,7 +267,7 @@ Martin Konecny (martin.konecny@sourcefabric.org) James Moon (james.moon@sourcefabric.org) Role: Software Developer - + Yuchen Wang (yuchen.wang@sourcefabric.org) Role: Software Developer @@ -350,10 +350,10 @@ Version 1.6.1 ------------- Same as previous version. -Version 1.6.0 +Version 1.6.0 ------------- This version marks a major change to the project, completely replacing the -custom audio player with liquidsoap, dropping the custom desktop GUI, and +custom audio player with liquidsoap, dropping the custom desktop GUI, and completely rewriting the web interface. The project has also been renamed from "Campcaster" to "Airtime" for this release. @@ -361,11 +361,11 @@ Paul Baranowski (paul.baranowski@sourcefabric.org) Role: Project Lead / Software Developer Highlights: - Integration and development of liquidsoap scheduler - - Separation of playlists from the scheduler + - Separation of playlists from the scheduler Naomi Aro (naomi.aro@sourcefabric.org) Role: Software Developer - Highlights: + Highlights: - New User Interface - Conversion to Propel DB backend @@ -397,44 +397,44 @@ generated radio station based in Basel, Switzerland powered by Campcaster. We ar very grateful for their contributions, and specifically to Thomas Gilgen, Dirk Claes, Rigzen Latshang and Fabiano Sidler. -Douglas Arellanes +Douglas Arellanes - Tester and user feedback -Robin Gareus +Robin Gareus - Packaging -Ferenc Gerlits +Ferenc Gerlits - Studio GUI -Sebastian Göbel +Sebastian Göbel - Web interface, storage server -Nebojsa Grujic +Nebojsa Grujic - Scheduler, XML-RPC interface, Gstreamer plugins -Tomáš Hlava +Tomáš Hlava - Bug fixes -Sava Tatić +Sava Tatić - Manager Version 1.3.0 - "Dakar" ----------------------- -Douglas Arellanes +Douglas Arellanes - Tester and user feedback -Ferenc Gerlits +Ferenc Gerlits - Studio GUI, scheduler, packaging -Sebastian Göbel +Sebastian Göbel - Web interface -Tomáš Hlava +Tomáš Hlava - Bug fixes -Sava Tatić +Sava Tatić - Manager @@ -442,19 +442,19 @@ Version 1.2.0 - "Kotor" ----------------------- In alphabetical order: -Douglas Arellanes +Douglas Arellanes - Tester and user feedback -Paul Baranowski +Paul Baranowski - Project manager, HTML UI, storage server -Ferenc Gerlits +Ferenc Gerlits - Studio GUI, scheduler, packaging -Tomáš Hlava +Tomáš Hlava - Bug fixes -Robert Klajn - - Superuser feedback -Mark Kretschmann +Robert Klajn + - Superuser feedback +Mark Kretschmann - Audio player -Sava Tatić +Sava Tatić - Manager @@ -462,40 +462,40 @@ Version 1.1.X - "Freetown" -------------------------- In alphabetical order: -Douglas Arellanes +Douglas Arellanes - Tester and user feedback -Paul Baranowski +Paul Baranowski - Project manager, HTML UI, storage server, scheduler -János Csikós +János Csikós - HTML UI -Ferenc Gerlits +Ferenc Gerlits - Studio GUI, scheduler, packaging -Tomáš Hlava +Tomáš Hlava - Storage server, network hub -Mark Kretschmann +Mark Kretschmann - Audio player -Ákos Maróy +Ákos Maróy - Architecture design, scheduler, audio player Sava Tatić - Manager Version 1.0 ----------- -The original Campcaster (LiveSupport) concept was drafted by Micz Flor. It was -fully developed by Robert Klajn, Douglas Arellanes, Ákos Maróy, and Sava Tatić. -The user interface has been designed by Charles Truett, based on the initial work -done by a team of his then-fellow Parsons School of Design students Turi McKinley, -Catalin Lazia and Sangita Shah. The team was led by then-head of the school's +The original Campcaster (LiveSupport) concept was drafted by Micz Flor. It was +fully developed by Robert Klajn, Douglas Arellanes, Ákos Maróy, and Sava Tatić. +The user interface has been designed by Charles Truett, based on the initial work +done by a team of his then-fellow Parsons School of Design students Turi McKinley, +Catalin Lazia and Sangita Shah. The team was led by then-head of the school's Department of Digital Design Colleen Macklin, assisted by Kunal Jain. In alphabetical order: Douglas Arellanes -Michael Aschauer -Micz Flor +Michael Aschauer +Micz Flor Ferenc Gerlits Sebastian Göbel Tomáš Hlava Nadine Kokot -Ákos Maróy +Ákos Maróy Sava Tatić Charles Truett diff --git a/changelog b/changelog index c2b3edfb9..c3c28732c 100644 --- a/changelog +++ b/changelog @@ -49,14 +49,14 @@ * Much faster library import (Silan analyzer runs in background) * Fixed zombie process sometimes being created * Other - * Upgrade to Mutagen (tag reader) 1.21 + * Upgrade to Mutagen (tag reader) 1.21 2.3.0 - Jan 21st, 2013 * New features * Localization (Chinese, Czech, English, French, German, Italian, Korean, Portuguese, Russian, Spanish) * User management page for non-admin users - * Listener statistics (Icecast/Shoutcast) + * Listener statistics (Icecast/Shoutcast) * Airtime no longer requires Apache document root * Replay Gain offset in real-time * Enable/disable replay gain @@ -113,7 +113,7 @@ * Playlist Builder should remember your position instead of resetting to the first page every time an operation was performed * If Master or Live input source is disconnected, Airtime will no longer automatically switch off that source. This should allow the source to reconnect and continue playback. - + * Bug fixes * Fixed playout engine sometimes not receiving new schedule which could result in dead air * Fixed script timeout which caused Apache to become unresponsive @@ -174,7 +174,7 @@ * Fixed Airtime could stop automatically recording after 2 hours if the web interface isn't used. * Fixed upgrading from 1.8.2 when the stor directory was a symlink would cause filenames to not be preserved. * Fixed Day View in the Now Playing tab showed some items on incorrect days. - * Fixed problems with having an equal '=' sign as an icecast password + * Fixed problems with having an equal '=' sign as an icecast password * Other * Various optimizations to make Airtime feel snappier in the browser. Various views should load much quicker. @@ -295,11 +295,11 @@ - Fixed pypo hanging if web server is unavailable - Fixed items that were being dragged and dropped in the Playlist Builder being obscured by other UI elements. - + 1.9.3 - August 26th, 2011 * Improvements - It is now possible to upgrade your system while a show is playing. - Playout will be temporarily interrupted for about 5-10 seconds and then + Playout will be temporarily interrupted for about 5-10 seconds and then playout will resume. Previously playout would not resume until the next scheduled show. * Fixes @@ -324,7 +324,7 @@ - Prevent users from doing a manual install of Airtime if they already have the Debian package version installed * Changes - - Support Settings moved to a separate page accessible by Admin user only. + - Support Settings moved to a separate page accessible by Admin user only. 1.9.0 - August 9, 2011 @@ -333,20 +333,20 @@ The cool stuff: - Human-readable file structure. The directory structure and file names on disk are now human-readable. This means you can easily find files using your file browser on your server. - - Magic file synchronization. Edits to your files are automatically + - Magic file synchronization. Edits to your files are automatically noticed by Airtime. If you edit any files on disk, such as trimming the length of a track, Airtime will automatically notice this and adjust the playlist lengths and shows for that audio file. - - Auto-import and multiple-directory support. You can set any number of - directories to be watched by Airtime. Any new files you add to watched + - Auto-import and multiple-directory support. You can set any number of + directories to be watched by Airtime. Any new files you add to watched directories will be automatically imported into Airtime, and any deleted files will be automatically removed. - - The "airtime-import" command line tool can now set watched directories + - The "airtime-import" command line tool can now set watched directories and change the storage directory. - Graceful recovery from reboot. If the playout engine starts up and detects that a show should be playing at the current time, it will skip - to the right point in the track and start playing. Previously, Airtime - would not play anything until the next show started. This also fixes a + to the right point in the track and start playing. Previously, Airtime + would not play anything until the next show started. This also fixes a problem where the metadata on the stream was lost when a file had cue-in/out values set. Thanks to the Liquidsoap developers for implementing the ability to do all of this! @@ -354,28 +354,28 @@ The cool stuff: - A new "Program Manager" role. A program manager can create shows but can't change the preferences or modify users. - No more rebooting after install! Airtime now uses standard SystemV initd - scripts instead of non-standard daemontools. This also makes for a much + scripts instead of non-standard daemontools. This also makes for a much faster install. - - Frontend widgets are much easier to use and their theme can be modified + - Frontend widgets are much easier to use and their theme can be modified with CSS (Click here for more info and installation instructions). - Improved installation - only one command to install on Ubuntu! * Improvements: - - Cumulative time shown on playlists. The Playlist Builder now shows the + - Cumulative time shown on playlists. The Playlist Builder now shows the total time since the beginning of the playlist for each song. - - "End Time" instead of "Duration". In the Add/Edit Show dialog, we + - "End Time" instead of "Duration". In the Add/Edit Show dialog, we replaced the "Duration" field with "End Time". Users reported that this was a much more intuitive way to schedule the show. Duration is still shown as a read-only field. - Feedback & promotion system. Airtime now includes a way to send feedback - and promote your site on the Sourcefabric web page. This will greatly - enhance our ability to understand who is using the software, which in - turn will allow us to make appropriate features and receive grant + and promote your site on the Sourcefabric web page. This will greatly + enhance our ability to understand who is using the software, which in + turn will allow us to make appropriate features and receive grant funding. - The show recorder can now instantly cancel a show thanks to the use of RabbitMQ. - Only admins have the ability to delete files now. - - The playout engine now runs with a higher priority. This should help + - The playout engine now runs with a higher priority. This should help prevent any problems with audio skipping. - Airtime has been contained. It is now easier to run other apps on the same system with Airtime because it no longer messes with the system-wide @@ -386,12 +386,12 @@ The cool stuff: page( above the search box). * Bug fixes: - - Fixed bug where you couldn't import a file with a name longer than 255 + - Fixed bug where you couldn't import a file with a name longer than 255 characters. - Fixed bug where searching an audio archive of 15K+ files was slow. - Fixed bug where upgrading from more than one version back (e.g. 1.8.0 -> 1.9.0) did not work. - - Fixed bug where the wrong file length was reported for very large CBR + - Fixed bug where the wrong file length was reported for very large CBR mp3 files (thanks to mutagen developers for the patch!) 1.8.2 - June 8, 2011 @@ -456,30 +456,30 @@ Highlights: 1.8.0 - April 19, 2011 * The biggest feature of this release is the ability to edit shows. You can - change everything from ‘Name’, ‘Description’, and ‘URL’, to repeat and + change everything from ‘Name’, ‘Description’, and ‘URL’, to repeat and rebroadcast days. Show instances will be dynamically created or removed as - needed. Radio stations will be pleased to know they can now have up to + needed. Radio stations will be pleased to know they can now have up to ten rebroadcast shows too. * Airtime’s calendar now looks, feels and performs better than ever. Loading - a station schedule is now five to eight times faster. In our tests of 1.7, - if the month calendar had shows scheduled for every hour of every day, it + a station schedule is now five to eight times faster. In our tests of 1.7, + if the month calendar had shows scheduled for every hour of every day, it used to take 16 seconds to load. Now in 1.8 it takes two seconds. * It is possible to have up to ten rebroadcast shows now, in 1.7 it was only up to five. - * Airtime’s new installation script has two options for increased install - flexibility: --preserve to keep your existing config files, or --overwrite - to replace your existing config files with new ones. Uninstall no longer + * Airtime’s new installation script has two options for increased install + flexibility: --preserve to keep your existing config files, or --overwrite + to replace your existing config files with new ones. Uninstall no longer removes Airtime config files or the music storage directory. - * New improved look & feel of the calendar (thanks to the "FullCalendar" + * New improved look & feel of the calendar (thanks to the "FullCalendar" jQuery project). - * Installation now puts files in standard locations in the Linux file + * Installation now puts files in standard locations in the Linux file hierarchy, which prepares the project to be accepted into Ubuntu and Debian. - Also because of our wish to be part of those projects, the default output - stream type is now OGG instead of MP3 -- due to MP3 licensing issues. + Also because of our wish to be part of those projects, the default output + stream type is now OGG instead of MP3 -- due to MP3 licensing issues. This configuration can be changed in "/etc/airtime/liquidsoap.conf". - * You now have the ability to start and stop pypo and the show recorder from - the command line with the commands "airtime-pypo-start", - "airtime-pypo-stop", "airtime-show-recorder-start", and + * You now have the ability to start and stop pypo and the show recorder from + the command line with the commands "airtime-pypo-start", + "airtime-pypo-stop", "airtime-show-recorder-start", and "airtime-show-recorder-stop". * Bug fixes: - CC-2192 Schedule sent to pypo is not sorted by start time. @@ -520,7 +520,7 @@ Highlights: * Bug fixes: - CC-2082 OGG stream dies after every song when using MPlayer - CC-1894 Warn users about time zone differences or clock drift problems on - the server + the server - CC-2058 Utilities are not in the system $PATH - CC-2051 Unable to change user password - CC-2030 Icon needed for Cue In/Out @@ -531,7 +531,7 @@ Bug fixes: * CC-1973 Liquidsoap crashes after multi-day playout * CC-1970 API key fix (Security fix) - Each time you run the install scripts, a new API key is now generated. - * CC-1992 Editing metadata goes blank on 'submit' + * CC-1992 Editing metadata goes blank on 'submit' * CC-1993 ui start time and song time unsynchronized 1.6.0 - Feb 14, 2011 diff --git a/dev_tools/README_TRANSLATIONS b/dev_tools/README_TRANSLATIONS index d5ccfdce3..71adfb32f 100644 --- a/dev_tools/README_TRANSLATIONS +++ b/dev_tools/README_TRANSLATIONS @@ -7,5 +7,5 @@ To update the Airtime translations: - Commit the updated files. - Push to GitHub. - Transifex will then pick up the updated files in about 24 hours, and they'll be available for translation there. -- After translators have updated strings, they'll be automatically downloaded and committed to our git repo by +- After translators have updated strings, they'll be automatically downloaded and committed to our git repo by a script running here at Sourcefabric (contact Andrey). diff --git a/dev_tools/auto_schedule_show.php b/dev_tools/auto_schedule_show.php index d9f47bc44..82abe7eeb 100644 --- a/dev_tools/auto_schedule_show.php +++ b/dev_tools/auto_schedule_show.php @@ -1,13 +1,13 @@ format("Y-m-d H:i:s"); @@ -79,7 +79,7 @@ function insertIntoCcShowInstances($conn, $show_id, $starts, $ends, $files){ $values = "('$starts', '$ends', $show_id, 0, 0, NULL, NULL, TIMESTAMP '$ends' - TIMESTAMP '$starts', '$now', 'f')"; $query = "INSERT INTO cc_show_instances $columns values $values "; echo $query.PHP_EOL; - + $result = query($conn, $query); $query = "SELECT currval('cc_show_instances_id_seq');"; @@ -92,7 +92,7 @@ function insertIntoCcShowInstances($conn, $show_id, $starts, $ends, $files){ while ($row = pg_fetch_array($result)) { $show_instance_id = $row["currval"]; } - + return $show_instance_id; } @@ -102,9 +102,9 @@ function insertIntoCcShowInstances($conn, $show_id, $starts, $ends, $files){ */ function insertIntoCcSchedule($conn, $files, $show_instance_id, $p_starts, $p_ends){ $columns = "(starts, ends, file_id, clip_length, fade_in, fade_out, cue_in, cue_out, media_item_played, instance_id)"; - + $starts = $p_starts; - + foreach($files as $file){ $endsDateTime = new DateTime($starts, new DateTimeZone("UTC")); @@ -115,9 +115,9 @@ function insertIntoCcSchedule($conn, $files, $show_instance_id, $p_starts, $p_en $values = "('$starts', '$ends', $file[id], '$file[length]', '00:00:00', '00:00:00', '00:00:00', '$file[length]', 'f', $show_instance_id)"; $query = "INSERT INTO cc_schedule $columns VALUES $values"; echo $query.PHP_EOL; - + $starts = $ends; - $result = query($conn, $query); + $result = query($conn, $query); } } @@ -131,7 +131,7 @@ function getEndTime($startDateTime, $p_files){ foreach ($p_files as $file){ $startDateTime->add(getDateInterval($file['length'])); } - + return $startDateTime; } @@ -142,7 +142,7 @@ function rabbitMqNotify(){ echo "Contacting $url".PHP_EOL; $ch = curl_init($url); curl_exec($ch); - curl_close($ch); + curl_close($ch); } $conn = pg_connect("host=localhost port=5432 dbname=airtime user=airtime password=airtime"); @@ -152,9 +152,9 @@ if (!$conn) { } if (count($argv) > 1){ - if ($argv[1] == "--clean"){ + if ($argv[1] == "--clean"){ $tables = array("cc_schedule", "cc_show_instances", "cc_show"); - + foreach($tables as $table){ $query = "DELETE FROM $table"; echo $query.PHP_EOL; @@ -162,9 +162,9 @@ if (count($argv) > 1){ } rabbitMqNotify(); exit(0); - } else { + } else { $str = <<format("Y-m-d H:i:s"); //$ends = $endDateTime->format("Y-m-d H:i:s"); -$files = getFileFromCcFiles($conn); +$files = getFileFromCcFiles($conn); $show_id = insertIntoCcShow($conn); $endDateTime = getEndTime(clone $startDateTime, $files); diff --git a/dev_tools/compare_cc_files_to_fs.py b/dev_tools/compare_cc_files_to_fs.py index 5b83d27df..993778769 100644 --- a/dev_tools/compare_cc_files_to_fs.py +++ b/dev_tools/compare_cc_files_to_fs.py @@ -30,7 +30,7 @@ class AirtimeMediaMonitorBootstrap: config = ConfigObj("/etc/airtime/airtime.conf") self.api_client = apc.api_client_factory(config) - """ + """ try: logging.config.fileConfig("logging.cfg") except Exception, e: diff --git a/dev_tools/liquidsoap_compile/liquidsoap-compile.sh b/dev_tools/liquidsoap_compile/liquidsoap-compile.sh index 1f4a7d84a..67b394352 100755 --- a/dev_tools/liquidsoap_compile/liquidsoap-compile.sh +++ b/dev_tools/liquidsoap_compile/liquidsoap-compile.sh @@ -90,7 +90,7 @@ fi rm -rf liquidsoap-full git clone https://github.com/savonet/liquidsoap-full cd liquidsoap-full -git checkout master +git checkout master make init make update diff --git a/dev_tools/liquidsoap_compile/run.sh b/dev_tools/liquidsoap_compile/run.sh index 2e20ff22a..bf7cf4b98 100755 --- a/dev_tools/liquidsoap_compile/run.sh +++ b/dev_tools/liquidsoap_compile/run.sh @@ -26,7 +26,7 @@ build_env () { echo "Please use -u to assign sudo username before build environments." exit 1 fi - + echo "build_env $1" #exec > >(tee ./liquidsoap_compile_logs/build_env_$1.log) os=`echo $1 | awk '/(debian)/'` @@ -40,7 +40,7 @@ build_env () { useradd tmp echo "User tmp is created." fi - + apt-get update apt-get --force-yes -y install debootstrap dchroot echo [$1] > /etc/schroot/chroot.d/$1.conf @@ -87,7 +87,7 @@ compile_liq () { else mv ./liquidsoap-compile_logs/compile_liq_$1.log ./liquidsoap-compile_logs/fail_to_compile_liq_$1.log fi -} +} os_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_precise_32" "ubuntu_precise_64" "ubuntu_quantal_32" "ubuntu_quantal_64" "ubuntu_raring_32" "ubuntu_raring_64" "debian_squeeze_32" "debian_squeeze_64" "debian_wheezy_32" "debian_wheezy_64") @@ -147,7 +147,7 @@ do compile_liq ${os_versions[$i]} | tee ./liquidsoap-compile_logs/compile_liq_${os_versions[$i]}.log flag=0 fi - done + done if [ $flag = 1 ];then echo "Unsupported Platform from:" for k in "${os_versions[@]}" diff --git a/dev_tools/release/release.sh b/dev_tools/release/release.sh index 975145dd3..1f25f9147 100755 --- a/dev_tools/release/release.sh +++ b/dev_tools/release/release.sh @@ -74,7 +74,7 @@ tar -czf $target_file \ --exclude dev_tools \ --exclude vendor/phing \ --exclude vendor/simplepie/simplepie/tests \ - libretime-${suffix} + libretime-${suffix} echo " Done" popd diff --git a/dev_tools/scripts/git-config-git-merge-po b/dev_tools/scripts/git-config-git-merge-po index 6fe011f1b..a91926ce8 100644 --- a/dev_tools/scripts/git-config-git-merge-po +++ b/dev_tools/scripts/git-config-git-merge-po @@ -1,5 +1,5 @@ [merge "pofile"] name = Gettext merge driver driver = git merge-po %O %A %B - + diff --git a/dev_tools/scripts/git-merge-po b/dev_tools/scripts/git-merge-po index 820904236..e717fc75d 100644 --- a/dev_tools/scripts/git-merge-po +++ b/dev_tools/scripts/git-merge-po @@ -1,6 +1,6 @@ #!/bin/sh # -# https://gist.github.com/mezis/1605647 +# https://gist.github.com/mezis/1605647 # by Julien Letessier (mezis) # # Custom Git merge driver - merges PO files using msgcat(1) @@ -8,15 +8,15 @@ # - Install gettext # # - Place this script in your PATH -# +# # - Add this to your .git/config : # # [merge "pofile"] # name = Gettext merge driver # driver = git merge-po %O %A %B -# +# # - Add this to .gitattributes : -# +# # *.po merge=pofile # *.pot merge=pofile # diff --git a/dev_tools/toggle-pypo-debug.sh b/dev_tools/toggle-pypo-debug.sh index 6468066a1..b10c6b47e 100755 --- a/dev_tools/toggle-pypo-debug.sh +++ b/dev_tools/toggle-pypo-debug.sh @@ -5,7 +5,7 @@ if [[ $EUID -ne 0 ]]; then fi usage () { - echo "Use --enable or --disable flag. Enable is to set up environment" + echo "Use --enable or --disable flag. Enable is to set up environment" echo "for specified user. --disable is to reset it back to pypo user" } @@ -28,7 +28,7 @@ elif [ "$1" = "--disable" ]; then echo "Changing ownership to user $1" chmod 644 /etc/airtime/airtime.conf chown -Rv $user:$user /var/tmp/airtime/pypo/ - chmod -v a+r /etc/airtime/api_client.cfg + chmod -v a+r /etc/airtime/api_client.cfg /etc/init.d/airtime-playout stop-liquidsoap diff --git a/docs/_includes/head.html b/docs/_includes/head.html index 4c48eeda6..188aeae12 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -4,13 +4,13 @@ - + - + - + {{ site.title }} - {{ page.title }} \ No newline at end of file diff --git a/docs/_includes/navbar.html b/docs/_includes/navbar.html index 4a7ea4c1b..cc568c395 100644 --- a/docs/_includes/navbar.html +++ b/docs/_includes/navbar.html @@ -1,6 +1,6 @@