Skip to content

Commit 5679205

Browse files
committed
change nuv_sql regex
add symlinks to the makefile, so users can use stuff like nuvexport-xvid
1 parent 7ebc231 commit 5679205

File tree

2 files changed

+27
-11
lines changed

2 files changed

+27
-11
lines changed

trunk/Makefile

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,28 @@
22
# Makefile for installing nuvexport
33
#
44

5-
MODULE_DIRS = export mythtv nuv_export
6-
EXPORT_MODULES = export/generic.pm export/ffmpeg.pm export/transcode.pm \
7-
export/DVCD.pm export/DVD.pm export/MP3.pm \
8-
export/MPEG2_cut.pm export/NUV_SQL.pm export/SVCD.pm \
9-
export/VCD.pm export/WMV.pm export/XviD.pm
10-
MYTHTV_MODULES = mythtv/nuvinfo.pm mythtv/db.pm mythtv/recordings.pm
11-
NUVEXPORT_MODULES = nuv_export/shared_utils.pm nuv_export/task.pm \
5+
BINS = mpeg2cut nuvexport nuvinfo
6+
MANS = man/nuvexport.1
7+
MODULE_DIRS = export mythtv nuv_export
8+
EXPORT_MODULES = export/generic.pm \
9+
export/ffmpeg.pm \
10+
export/transcode.pm \
11+
export/DVCD.pm \
12+
export/DVD.pm \
13+
export/MP3.pm \
14+
export/MPEG2_cut.pm \
15+
export/NUV_SQL.pm \
16+
export/SVCD.pm \
17+
export/VCD.pm \
18+
export/WMV.pm \
19+
export/XviD.pm
20+
MYTHTV_MODULES = mythtv/nuvinfo.pm \
21+
mythtv/db.pm \
22+
mythtv/recordings.pm
23+
NUVEXPORT_MODULES = nuv_export/shared_utils.pm \
24+
nuv_export/task.pm \
1225
nuv_export/ui.pm
13-
BINS = mpeg2cut nuvexport nuvinfo
14-
MANS = man/nuvexport.1
26+
NUVEXPORT_LINKS = dvcd dvd mp3 mpeg2cut nuvsql svcd vcd wmv xvid
1527

1628
OWNER = -o root -g root
1729

@@ -31,6 +43,10 @@ install:
3143
@for i in ${BINS} ; do \
3244
${INSTALL} -Dv ${OWNER} -m 0755 $$i ${BINDIR}/$$i; \
3345
done
46+
# Install the mode symlinks
47+
@for i in ${NUVEXPORT_LINKS} ; do \
48+
ln -fs ${BINDIR}/nuvexport ${BINDIR}/nuvexport-$$i; \
49+
done
3450
# Install the modules
3551
@for i in ${EXPORT_MODULES} ${MYTHTV_MODULES} ${NUVEXPORT_MODULES} ; do \
3652
${INSTALL} -Dv ${OWNER} -m 0755 $$i ${MODDIR}/$$i; \
@@ -40,5 +56,5 @@ install:
4056
@for i in ${MANS} ; do \
4157
${INSTALL} -v ${OWNER} -m 0644 $$i ${MANDIR}; \
4258
done
43-
59+
4460

trunk/export/NUV_SQL.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package export::NUV_SQL;
2121
sub new {
2222
my $class = shift;
2323
my $self = {
24-
'cli' => qr/\bnuv[\-_]sql\b/i,
24+
'cli' => qr/\bnuv[\-_]?sql\b/i,
2525
'name' => 'Export to .nuv and .sql',
2626
'enabled' => 1,
2727
'errors' => [],

0 commit comments

Comments
 (0)