Author: pebender
Date: Sun Nov 30 19:29:06 2008
New Revision: 4030
Added:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/atiusb
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.atiusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/dvico
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.dvico
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/imon
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.imon
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/irman
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.irman
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/mceusb
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.mceusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/mceusb2
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/serial
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.serial
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/streamzap
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.streamzap
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/tira
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.tira
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/atiusb
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.atiusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/atiusb.x10_or23e
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.atiusb.x10_or23e
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/dvico.usb_0fe9_9010
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.dvico.usb_0fe9_9010
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/imon
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.imon
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/irman.hauppauge_A415
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.irman.hauppauge_A415
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/irman.hauppauge_R808
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.irman.hauppauge_R808
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/mceusb.mceusb
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.mceusb.mceusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/mceusb2.mceusb2
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.mceusb2.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/serial.hauppauge_R808
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.serial.hauppauge_R808
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/streamzap.streamzap
- copied unchanged from r4022,
/trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.streamzap.streamzap
Removed:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.atiusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.dvico
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.imon
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.irman
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.mceusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.serial
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.streamzap
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/driver.conf.d/driver.conf.tira
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.atiusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.atiusb.x10_or23e
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.dvico.usb_0fe9_9010
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.imon
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.irman.hauppauge_A415
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.irman.hauppauge_R808
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.mceusb.mceusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.mceusb2.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.serial.hauppauge_R808
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircd.conf.d/lircd.conf.streamzap.streamzap
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc.d/lircrc.hauppauge_A415
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc.d/lircrc.hauppauge_R808
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc.d/lircrc.mceusb
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc.d/lircrc.mceusb2
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc.power.sleep
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc.volume.external
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/lirc.d/lircrc.volume.internal
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
Log:
- First half of /etc/lirc.d directory restructuring
- Shortened the names of files in /etc/lirc.d/driver.conf.d and
/etc/lirc.d/lircd.conf.
- Restructured the lircrc files so that they are grouped by application.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/conf.d/MM_LIRC
Sun Nov 30 19:29:06 2008
@@ -79,15 +79,15 @@
# Read LIRC driver specific configuration file,
# but do not allow the values to override values in the MiniMyth
configuration file.
if /usr/bin/test ! "${MM_LIRC_DRIVER}" = "none" && \
- /usr/bin/test -r
/etc/lirc.d/driver.conf.d/driver.conf.${MM_LIRC_DRIVER} ; then
- /bin/rm -rf /tmp/driver.conf.${MM_LIRC_DRIVER}~
- /bin/cat /etc/lirc.d/driver.conf.d/driver.conf.${MM_LIRC_DRIVER} \
+ /usr/bin/test -r /etc/lirc.d/driver.conf.d/${MM_LIRC_DRIVER} ; then
+ /bin/rm -rf /tmp/driver.conf.${MM_LIRC_DRIVER}.$$
+ /bin/cat /etc/lirc.d/driver.conf.d/${MM_LIRC_DRIVER} \
| /bin/sed -e 's%#.*$%%g' \
| /bin/sed -e 's%^ *%%' \
| /bin/sed -e 's%^\(.*\)$%local _\1%' \
- > /tmp/driver.conf.${MM_LIRC_DRIVER}~
- . /tmp/driver.conf.${MM_LIRC_DRIVER}~
- /bin/rm -rf /tmp/driver.conf.${MM_LIRC_DRIVER}~
+ > /tmp/driver.conf.${MM_LIRC_DRIVER}.$$
+ . /tmp/driver.conf.${MM_LIRC_DRIVER}.$$
+ /bin/rm -rf /tmp/driver.conf.${MM_LIRC_DRIVER}.$$
if /usr/bin/test "${MM_LIRC_DEVICE}" = "auto" ; then
MM_LIRC_DEVICE="${_MM_LIRC_DEVICE}"
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/init.d/lirc
Sun Nov 30 19:29:06 2008
@@ -83,6 +83,7 @@
start() {
+ local application_path
local daemon
local daemon_master
local delay
@@ -142,27 +143,48 @@
# If there is no lircd.conf file, then create it.
if /usr/bin/test ! -e /etc/lircd.conf ; then
- /bin/echo "# autogenerated" >> /etc/lircd.conf
- for file in `/bin/ls /etc/lirc.d/lircd.conf.d/lircd.conf.* 2>
/dev/null` ; do
- /bin/echo "include <${file}>" >> /etc/lircd.conf
+ /bin/rm -rf /tmp/lircd.conf.$$
+ /bin/touch /tmp/lircd.conf.$$
+ for file in `/bin/ls /etc/lirc.d/lircd.conf.d/* 2> /dev/null` ; do
+ /bin/echo "include <${file}>" >> /tmp/lircd.conf.$$
done
+ /bin/echo "# autogenerated" >> /etc/lircd.conf
+ /bin/cat /tmp/lircd.conf.$$ | /usr/bin/sort >> /etc/lircd.conf
+ /bin/rm -rf /tmp/lircd.conf.$$
fi
# If there is no lircrc file, then create it.
if /usr/bin/test ! -e /etc/lircrc ; then
- /bin/echo "# autogenerated" >> /etc/lircrc
- /bin/echo "include /etc/lirc.d/lircrc" >> /etc/lircrc
- if /usr/bin/test "${MM_LIRC_SLEEP_ENABLED}" = "yes" ; then
- /bin/echo "include /etc/lirc.d/lircrc.power.sleep" >>
/etc/lircrc
- fi
- if /usr/bin/test "${MM_EXTERNAL_VOLUME_ENABLED}" = "yes" ; then
- /bin/echo "include /etc/lirc.d/lircrc.volume.external" >>
/etc/lircrc
- else
- /bin/echo "include /etc/lirc.d/lircrc.volume.internal" >>
/etc/lircrc
- fi
- for file in `/bin/ls /etc/lirc.d/lircrc.d/lircrc.* 2> /dev/null` ;
do
- /bin/echo "include ${file}" >> /etc/lircrc
+ /bin/rm -rf /tmp/lircrc.$$
+ /bin/touch /tmp/lircrc.$$
+ for application_path in `/bin/ls -d /etc/lirc.d/lircrc.d/* 2>
/dev/null` ; do
+ if /usr/bin/test -f "${application_path}" ; then
+ /bin/echo "include ${application_path}" >> /tmp/lircrc.$$
+ elif /usr/bin/test -d "${application_path}" ; then
+ for file in `/bin/ls -d ${application_path}/* 2>
/dev/null` ; do
+ if /usr/bin/test -f "${file}" ; then
+ /bin/echo "include ${file}" >> /tmp/lircrc.$$
+ fi
+ done
+ if /usr/bin/test "${MM_LIRC_SLEEP_ENABLED}" = "yes" ; then
+ if /usr/bin/test
-f "${application_path}/optional/key.power.sleep" ; then
+ /bin/echo "include
${application_path}/optional/key.power.sleep" >> /tmp/lircrc.$$
+ fi
+ fi
+ if /usr/bin/test "${MM_EXTERNAL_VOLUME_ENABLED}" = "yes" ;
then
+ if /usr/bin/test
-f "${application_path}/optional/key.volume.external" ; then
+ /bin/echo "include
${application_path}/optional/key.volume.external" >> /tmp/lircrc.$$
+ fi
+ else
+ if /usr/bin/test
-f "${application_path}/optional/key.volume.internal" ; then
+ /bin/echo "include
${application_path}/optional/key.volume.internal" >> /tmp/lircrc.$$
+ fi
+ fi
+ fi
done
+ /bin/echo "# autogenerated" >> /tmp/lircrc
+ /bin/cat /tmp/lircrc.$$ | /usr/bin/sort >> /etc/lircrc
+ /bin/rm -rf /tmp/lircrc.$$
fi
# Create directories used by the LIRC daemon.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_LIRC.pm
Sun Nov 30 19:29:06 2008
@@ -61,7 +61,7 @@
my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
if ($driver)
{
- my $driver_file
= "/etc/lirc.d/driver.conf.d/driver.conf.$driver";
+ my $driver_file = "/etc/lirc.d/driver.conf.d/$driver";
if ((-r $driver_file) && (open(FILE, '<', $driver_file)))
{
while (<FILE>)
@@ -91,7 +91,7 @@
my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
if ($driver)
{
- my $driver_file
= "/etc/lirc.d/driver.conf.d/driver.conf.$driver";
+ my $driver_file = "/etc/lirc.d/driver.conf.d/$driver";
if ((-r $driver_file) && (open(FILE, '<', $driver_file)))
{
while (<FILE>)
@@ -121,7 +121,7 @@
my $driver = $minimyth->var_get('MM_LIRC_DRIVER');
if ($driver)
{
- my $driver_file
= "/etc/lirc.d/driver.conf.d/driver.conf.$driver";
+ my $driver_file = "/etc/lirc.d/driver.conf.d/$driver";
if ((-r $driver_file) && (open(FILE, '<', $driver_file)))
{
while (<FILE>)
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/lirc.pm
Sun Nov 30 19:29:06 2008
@@ -183,21 +183,22 @@
# If there is no lircd.conf file, then create it.
if (! -e '/etc/lircd.conf')
{
+ my $lircd_conf_path = q(/etc/lirc.d/lircd.conf.d);
my @lircd_conf_list = ();
- if (opendir(DIR, '/etc/lirc.d/lircd.conf.d'))
+ if (opendir(DIR, $lircd_conf_path))
{
- foreach (grep((/^lircd\.conf\./) &&
(-f "/etc/lirc.d/lircd.conf.d/$_"), (readdir(DIR))))
+ foreach (grep((! /^\./) && (-f qq($lircd_conf_path/$_)),
(readdir(DIR))))
{
- push(@lircd_conf_list, "/etc/lirc.d/lircd.conf.d/$_");
+ push(@lircd_conf_list, qq($lircd_conf_path/$_));
}
closedir(DIR);
}
- if (open(FILE, '>', '/etc/lircd.conf'))
+ if (open(FILE, '>', q(/etc/lircd.conf)))
{
- print FILE "# autogenerated\n";
- foreach (@lircd_conf_list)
+ print FILE qq(# autogenerated\n);
+ foreach (sort @lircd_conf_list)
{
- print FILE "include <$_>\n";
+ print FILE qq(include <$_>\n);
}
close(FILE);
}
@@ -206,34 +207,70 @@
# If there is no lircrc file, then create it.
if (! -e '/etc/lircrc')
{
- my @lircrc_list = ();
- push(@lircrc_list, '/etc/lirc.d/lircrc');
- if ($minimyth->var_get('MM_LIRC_SLEEP_ENABLED') eq 'yes')
- {
- push(@lircrc_list, '/etc/lirc.d/lircrc.power.sleep');
- }
- if ($minimyth->var_get('MM_EXTERNAL_VOLUME_ENABLED') eq 'yes')
+ my $lircrc_path = q(/etc/lirc.d/lircrc.d);
+ # Create a list of lircrc applications.
+ my @application_path_list = ();
+ if (opendir(DIR, $lircrc_path))
{
- push(@lircrc_list, '/etc/lirc.d/lircrc.volume.external');
- }
- else
- {
- push(@lircrc_list, '/etc/lirc.d/lircrc.volume.internal');
+ foreach (grep((! /^\./), (readdir(DIR))))
+ {
+ push(@application_path_list, qq($lircrc_path/$_));
+ }
+ closedir(DIR);
}
- if (opendir(DIR, '/etc/lirc.d/lircrc.d'))
+
+ # Create a list of lircrc files.
+ my @lircrc_list = ();
+ foreach my $application_path (@application_path_list)
{
- foreach (grep((/^lircrc\./) && (-f "/etc/lirc.d/lircrc.d/$_"),
(readdir(DIR))))
+ # Add all lircrc application files to the lircrc file list.
+ if (-f $application_path)
{
- push(@lircrc_list, "/etc/lirc.d/lircrc.d/$_");
+ push(@lircrc_list, $application_path);
+ }
+ # Process all lircrc application directories.
+ elsif (-d $application_path)
+ {
+ # Add all files in the lircrc application directory to the
lircrc file list.
+ if (opendir(DIR, $application_path))
+ {
+ foreach (grep(((! /^\./) && (-f
qq($application_path/$_)), (readdir(DIR)))))
+ {
+ push(@lircrc_list, qq($application_path/$_));
+ }
+ closedir(DIR);
+ }
+ # Add files for the power key(s).
+ if ($minimyth->var_get('MM_LIRC_SLEEP_ENABLED') eq 'yes')
+ {
+ if (-f qq($application_path/optional/key.power.sleep))
+ {
+ push(@lircrc_list,
qq($application_path/optional/key.power.sleep));
+ }
+ }
+ # Add files for the volume key(s).
+ if ($minimyth->var_get('MM_EXTERNAL_VOLUME_ENABLED')
eq 'yes')
+ {
+ if (-f
qq($application_path/optional/key.volume.external))
+ {
+ push(@lircrc_list,
qq($application_path/optional/key.volume.external));
+ }
+ }
+ else
+ {
+ if (-f
qq($application_path/optional/key.volume.internal))
+ {
+ push(@lircrc_list,
qq($application_path/optional/key.volume.internal));
+ }
+ }
}
- closedir(DIR);
}
- if (open(FILE, '>', '/etc/lircrc'))
+ if (open(FILE, '>', q(/etc/lircrc)))
{
- print FILE "# autogenerated\n";
- foreach (@lircrc_list)
+ print FILE qq(# autogenerated\n);
+ foreach (sort @lircrc_list)
{
- print FILE "include $_\n";
+ print FILE qq(include $_\n);
}
close(FILE);
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
