diff options
| -rw-r--r-- | HISTORY.h | 7 | ||||
| -rwxr-xr-x | scripts/epgd-conflictsof | 3 | ||||
| -rwxr-xr-x | scripts/epgd-dropall | 3 | ||||
| -rwxr-xr-x | scripts/epgd-import-epglv | 7 | ||||
| -rwxr-xr-x | scripts/epgd-showdones | 3 | ||||
| -rwxr-xr-x | scripts/epgd-showmerge | 3 | ||||
| -rwxr-xr-x | scripts/epgd-showtimer | 3 | ||||
| -rwxr-xr-x | scripts/epgd-showtimerat | 3 |
8 files changed, 20 insertions, 12 deletions
@@ -4,7 +4,7 @@ * ----------------------------------- */ -#define _VERSION "1.1.145" +#define _VERSION "1.1.146" #define VERSION_DATE "21.10.2018" #define DB_API 7 @@ -18,9 +18,12 @@ * ------------------------------------ * -2018-10-21: version 1.1.145 (horchi) +2018-10-21: version 1.1.146 (horchi) change: Fixed gentoo compile problem +2018-10-04: version 1.1.145 (horchi) + change: Optimized mysql password handling in epgd scripts + 2018-10-03: version 1.1.144 (horchi) change: Fixed g++-8 warnings diff --git a/scripts/epgd-conflictsof b/scripts/epgd-conflictsof index e21c47f..5e427d1 100755 --- a/scripts/epgd-conflictsof +++ b/scripts/epgd-conflictsof @@ -1,6 +1,7 @@ #!/bin/bash -export MYSQL_PWD=epg +MYSQL_PWD=${MYSQL_PWD:-epg} +export MYSQL_PWD if [ -z $1 ]; then exit diff --git a/scripts/epgd-dropall b/scripts/epgd-dropall index 5ebfe47..65ef65b 100755 --- a/scripts/epgd-dropall +++ b/scripts/epgd-dropall @@ -1,6 +1,7 @@ #!/bin/bash -export MYSQL_PWD=epg +MYSQL_PWD=${MYSQL_PWD:-epg} +export MYSQL_PWD echo "------------------------" echo "-- Drop normal tables --" diff --git a/scripts/epgd-import-epglv b/scripts/epgd-import-epglv index 2d9df0c..27aeb1b 100755 --- a/scripts/epgd-import-epglv +++ b/scripts/epgd-import-epglv @@ -1,8 +1,7 @@ -#!/bin/bash +#!/bin/bash -if [ -z MYSQL_PWD ]; then - export MYSQL_PWD=epg -fi +MYSQL_PWD=${MYSQL_PWD:-epg} +export MYSQL_PWD mysql -u root -e "DROP FUNCTION IF EXISTS epglv;" mysql -u root -e "DROP FUNCTION IF EXISTS epglvr;" diff --git a/scripts/epgd-showdones b/scripts/epgd-showdones index 86cd7b4..2616dc5 100755 --- a/scripts/epgd-showdones +++ b/scripts/epgd-showdones @@ -1,6 +1,7 @@ #!/bin/bash -export MYSQL_PWD=epg +MYSQL_PWD=${MYSQL_PWD:-epg} +export MYSQL_PWD mysql -u epg2vdr -Depg2vdr -e " \ select from_unixtime(updsp, '%d.%m %H:%m') as upd, id, state as s, substr(title,1,35), shorttext, episodecompname, episodecomppartname, expression from timersdone where state != 'D';" diff --git a/scripts/epgd-showmerge b/scripts/epgd-showmerge index 5f06f71..e226308 100755 --- a/scripts/epgd-showmerge +++ b/scripts/epgd-showmerge @@ -1,6 +1,7 @@ #!/bin/bash -export MYSQL_PWD=epg +MYSQL_PWD=${MYSQL_PWD:-epg} +export MYSQL_PWD if [ "$1" == "-h" ]; then diff --git a/scripts/epgd-showtimer b/scripts/epgd-showtimer index 5425caf..207283f 100755 --- a/scripts/epgd-showtimer +++ b/scripts/epgd-showtimer @@ -1,6 +1,7 @@ #!/bin/bash -export MYSQL_PWD=epg +MYSQL_PWD=${MYSQL_PWD:-epg} +export MYSQL_PWD if [ -z $1 ]; then STATE="(t.state != 'D' or t.state is null)" diff --git a/scripts/epgd-showtimerat b/scripts/epgd-showtimerat index bdc6d1d..57c579c 100755 --- a/scripts/epgd-showtimerat +++ b/scripts/epgd-showtimerat @@ -1,6 +1,7 @@ #!/bin/bash -export MYSQL_PWD=epg +MYSQL_PWD=${MYSQL_PWD:-epg} +export MYSQL_PWD mysql -u epg2vdr -Depg2vdr -e " \ select t.id, SUBSTRING_INDEX(t.channelid, '-', 3) as transponder, v.name, t.source, t.channelid, t.state as S, \ |