diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cam/Makefile.am | 4 | ||||
| -rw-r--r-- | cam/Makefile.in | 4 | ||||
| -rw-r--r-- | cam/README | 12 | ||||
| -rwxr-xr-x | cam/feh-cam (renamed from cam/cam) | 0 | ||||
| -rwxr-xr-x | cam/gen-cam-menu (renamed from cam/gen_cam_menu.sh) | 2 |
6 files changed, 16 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Git head + + * Fix chrome theme in the default .fehrc + * Rename cam to feh-cam and gen_cam_menu.sh to gen-cam-menu + Thu Mar 4 14:55:02 CET 2010 Daniel Friesel <derf@chaosdorf.de> * Release v1.4 diff --git a/cam/Makefile.am b/cam/Makefile.am index fb14a22..7fa0249 100644 --- a/cam/Makefile.am +++ b/cam/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign # A list of all the files in the current directory which can be regenerated MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = README cam_bookmarks cam gen_cam_menu.sh +EXTRA_DIST = README cam_bookmarks feh-cam gen-cam-menu camdir = $(bindir) -cam_SCRIPTS = cam gen_cam_menu.sh +cam_SCRIPTS = feh-cam gen-cam-menu diff --git a/cam/Makefile.in b/cam/Makefile.in index 97f79ca..d683a5b 100644 --- a/cam/Makefile.in +++ b/cam/Makefile.in @@ -83,10 +83,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign # A list of all the files in the current directory which can be regenerated MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = README cam_bookmarks cam gen_cam_menu.sh +EXTRA_DIST = README cam_bookmarks feh-cam gen-cam-menu camdir = $(bindir) -cam_SCRIPTS = cam gen_cam_menu.sh +cam_SCRIPTS = feh-cam gen-cam-menu mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../src/config.h CONFIG_CLEAN_FILES = @@ -5,8 +5,8 @@ Please see the file COPYING for licensing information. Description =========== -Cam is a Perl wrapper for feh that simlifies viewing webcams. Cam uses -keyed bookmarks. Type "cam --help" at the command line for usage +feh-cam is a Perl wrapper for feh that simlifies viewing webcams. It uses +keyed bookmarks. Type "feh-cam --help" at the command line for usage information. Webcam Information @@ -21,17 +21,17 @@ have come online since cam's original release (0.1). Installation ============ -- Copy the "cam" script to a location in your PATH (ex /usr/bin, +- Copy the "feh-cam" script to a location in your PATH (ex /usr/bin, /usr/local/bin, or $HOME/bin), and make sure hte execute bit on the script is set (type "chmod a+x $HOME/.cam_bookmarks"). - Copy the "cam_bookmarks" file to $HOME/.cam_bookmarks and make sure - cam can see it by typing "cam --list". -- Optionally, modify the options inside the cam script. You can pass + cam can see it by typing "feh-cam --list". +- Optionally, modify the options inside the feh-cam script. You can pass feh any options before the image by adjusting the $PRE variable, and any options after the image by adjustin the $POST variable. For example, I like to keep all cam images by default; you can enable this behavior with the -k command line option, or enable it permanently - by adding it to the $PRE flags in cam. + by adding it to the $PRE flags in feh-cam. About the Authors ================= diff --git a/cam/gen_cam_menu.sh b/cam/gen-cam-menu index 9fe3770..96618c3 100755 --- a/cam/gen_cam_menu.sh +++ b/cam/gen-cam-menu @@ -32,7 +32,7 @@ cp -f $F_MENU $F_MENU"-cam_menu.backup" # generate cam menu echo "Generating \""$C_MENU"\"."; echo "\"$TITLE\"" > "$C_MENU"; -cat $BMARKS | perl -e "while (<>) { /(.*?)=/; \$keys{\$1}=\"1\"; } foreach(sort keys %keys) { /(.)(.*$)/; print \"\\\"\".uc(\$1).\"\$2\\\" NULL exec \\\"cam \$1\$2\\\"\\n\"; }">> $C_MENU; +cat $BMARKS | perl -e "while (<>) { /(.*?)=/; \$keys{\$1}=\"1\"; } foreach(sort keys %keys) { /(.)(.*$)/; print \"\\\"\".uc(\$1).\"\$2\\\" NULL exec \\\"feh-cam \$1\$2\\\"\\n\"; }">> $C_MENU; # add entry to file menu if there isn't one echo "Generating \""$F_MENU"\"."; |