--- epg-daemon-2014.03.18/scripts/epgd-tool.orig 2014-03-18 11:55:45.000000000 +0100 +++ epg-daemon-2014.03.18/scripts/epgd-tool 2014-03-18 12:57:27.953475655 +0100 @@ -1,9 +1,8 @@ -#!/bin/bash +#!/bin/sh # mySQL helper script by 3PO -PASSWORD="" MY_CNF="/etc/mysql/my.cnf" rc_start () @@ -33,18 +32,7 @@ EPGD_RESTART="/sbin/restart epgd" } -chkRootPwd () -{ -[ -f ~/.ssh/mysqlpasswd ] && . ~/.ssh/mysqlpasswd -if [ ! $PASSWORD ] ; then - echo "root Password for MySQL Database is not set!" - echo "Exit" - exit -else - . ~/.ssh/mysqlpasswd - SQL_ROOT="mysql -u root -p$PASSWORD --verbose" -fi -} +SQL_ROOT="mysql -u root --verbose" if [ "$(ps -p 1 -o comm=)" == 'systemd' ] ; then systemd_start @@ -69,7 +57,6 @@ { [ "$PID_DB" -lt 1 ] && $MYSQL_START [ "$PID_EPGD" -ne 0 ] && $EPGD_STOP -chkRootPwd echo "DROP DATABASE epg2vdr;" |$SQL_ROOT } @@ -77,7 +64,6 @@ { [ "$PID_DB" -lt 1 ] && $MYSQL_START [ "$PID_EPGD" -ne 0 ] && $EPGD_STOP -chkRootPwd echo "DROP USER epg2vdr" |$SQL_ROOT } @@ -90,7 +76,6 @@ { [ "$PID_DB" -lt 1 ] && $MYSQL_START [ "$PID_EPGD" -ne 0 ] && $EPGD_STOP -chkRootPwd echo "DROP DATABASE epg2vdr;" |$SQL_ROOT echo "DROP USER epg2vdr;" |$SQL_ROOT } @@ -161,7 +146,6 @@ -new-db|new-db) [ "$PID_DB" -lt 1 ] && $MYSQL_START - chkRootPwd echo "CREATE DATABASE epg2vdr charset utf8;" |$SQL_ROOT echo "DROP FUNCTION IF EXISTS epglv;" |$SQL_ROOT echo "DROP FUNCTION IF EXISTS epglvr;" |$SQL_ROOT @@ -172,7 +156,6 @@ -new-u|new-u) [ "$PID_DB" -lt 1 ] && $MYSQL_START - chkRootPwd echo "CREATE USER 'epg2vdr'@'%' IDENTIFIED BY 'epg';" |$SQL_ROOT echo "GRANT ALL PRIVILEGES ON epg2vdr.* TO 'epg2vdr'@'%' IDENTIFIED BY 'epg';" |$SQL_ROOT echo "GRANT ALL PRIVILEGES ON epg2vdr.* TO 'epg2vdr'@'localhost' IDENTIFIED BY 'epg';" |$SQL_ROOT @@ -200,7 +183,6 @@ -show|show) [ "$PID_DB" -lt 1 ] && $MYSQL_START - chkRootPwd echo "SELECT User,Host,Db FROM mysql.db;" |$SQL_ROOT echo "SHOW GRANTS FOR epg2vdr;" |$SQL_ROOT echo "SHOW DATABASES;" |$SQL_ROOT --- epg-daemon/scripts/epgd-dropall.orig 2014-01-03 17:56:45.000000000 +0100 +++ epg-daemon/scripts/epgd-dropall 2014-01-09 23:50:49.026315992 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh echo "---------------------" echo "-- Drop all tables --"