[Chinese-commits] [fortune-zh] 01/05: dch, fortune-zh, man: remove options

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository fortune-zh.

commit 0f8bc112f1c8f75231396a150213341fc171859f
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 30 08:59:07 2016 +0000

    dch,fortune-zh,man: remove options
---
 debian/changelog | 17 ++++++-----------
 fortune-zh       | 28 +++-------------------------
 man/fortune-zh.6 | 15 +--------------
 3 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad99e75..7bf2520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,14 @@
 fortune-zh (2.0) UNRELEASED; urgency=low
 
   * New 2.X release.
-  * Add many new Chinese Culture data files:
-  	- chinese.d/
-  * Update debian/copyright
-    - Add myself
-    - Add the source of new contents
-  * Record the significant change of fortune-zh 2.0 in README.debian
-  * Update fortune-zh (new cookie file) with new options.
-  * Update package description.
-    - debian/control
-  * Update manpage describing some new features of 2.X
   * Fix invalid encodings in tang300 (LP: #499664)
+  * Add new Chinese cookie.
+  * Refresh debian/copyright.
+  * Record the significant change of fortune-zh 2.0 in README.debian
+  * Update description.
+  * Update manpage.
   * Simplify Makefile, removing redundant lines.
-  * Remove .u8 symlinks, and Create a fortune-zh.links to substitude them.
+  * Remove .u8 symlinks. Use fortune-zh.links instead.
 
  -- Zhou Mo <cdluminate at gmail.com>  Tue, 24 Feb 2015 04:21:05 +0000
 
diff --git a/fortune-zh b/fortune-zh
index db6696e..ccd5625 100755
--- a/fortune-zh
+++ b/fortune-zh
@@ -1,48 +1,26 @@
 #!/bin/sh
 # fortune-zh
-#   invokes fortune with Chinese cookies.
-
 set -e
 
 FORTUNE="/usr/games/fortune"
 
 # the old version (1.*) of fortune-zh only has tang300 and song100
 DICT="18% tang300 05% song100 77% chinese"
-DICT_TS="75% tang300 25% song100"
-DICT_C="chinese"
-# default settings
-USE_DICT=${DICT}
 
 # check LANG
 if [ ! -z $LC_ALL ]; then 
 	LANG="$LC_ALL"
 fi
 
-# check arg
-if [ ! -z $1 ]; then
-	case "$1" in
-	"ts")
-		USE_DICT=${DICT_TS}
-		;;
-	"c")
-		USE_DICT=${DICT_C}
-		;;
-	*)
-		;;
-	esac
-fi
-
 # output according to LANG
 case "$LANG" in
 "zh_CN.GB2312")
-	LANG=zh_CN.UTF8 $FORTUNE $USE_DICT | iconv -c -f utf8 -t gbk
+	LANG=zh_CN.UTF8 $FORTUNE $DICT | iconv -c -f utf8 -t gbk
 	;;
 "zh_TW.Big5")
-	LANG=zh_TW.UTF8 $FORTUNE $USE_DICT | iconv -c -f utf8 -t big5
+	LANG=zh_TW.UTF8 $FORTUNE $DICT | iconv -c -f utf8 -t big5
 	;;
 *)
-	$FORTUNE $USE_DICT 
+	$FORTUNE $DICT 
 	;;
 esac
-
-#EOF
diff --git a/man/fortune-zh.6 b/man/fortune-zh.6
index 4666b2b..94c1775 100644
--- a/man/fortune-zh.6
+++ b/man/fortune-zh.6
@@ -6,24 +6,11 @@
 fortune-zh \- Chinese Data files for fortune
 
 .SH SYNOPSIS
-.B fortune-zh [ ts | c ]
+.B fortune-zh
 
 .SH DESCRIPTION
 \fIfortune-zh\fR is a simple shell script that invokes \fIfortune\fR with Chinese data files 
 and their preset proportions.
-.PP
-When execute \fIfortune-zh\fR without args, it would use all available data files of 
-fortune-zh. If you want to change this behaviour, please consider the use of options
-below or directly invoke \fIfortune\fR with proper proportions by your self.
-
-.SH OPTIONS
-.TP
-\fBts\fR
-Only show cookies in \fBtang300\fR and \fBsong100\fR.
-
-.TP
-\fBc\fR
-Only show cookies in \fBchinese\fR.
 
 .SH DATAFILE
 .TP

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fortune-zh.git