Merge branch 'master' of git://github.com/RainMark/openkeeper-cli into RainMark-master

Author: Eventide

.gitignore

@@ -0,0 +1,8 @@
+*.cache
+*.log
+*.status
+*.o
+ok
+ok-start
+Makefile
+dialnetkeeper

Makefile

@@ -0,0 +1,43 @@
+CC = gcc
+CFLAGS = -O2 -Wall
+LDFLAGS = -lcrypto
+SRC_DIR = src
+PREFIX ?= @prefix@
+BIN_DIR = $(PREFIX)/bin
+DATA_DIR = $(PREFIX)/share/openkeeper
+
+$(SRC_DIR)/dialnetkeeper: $(SRC_DIR)/dialnetkeeper.o
+	$(CC) $< $(LDFLAGS) -o $@
+
+$(SRC_DIR)/%.o: $(SRC_DIR)%.c
+	$(CC) -c $< $(CFLAGS)
+
+.PHONY: clean install uninstall dist-clean
+
+clean:
+	rm -rf $(SRC_DIR)/*.o $(SRC_DIR)/dialnetkeeper
+	rm -rf autom4te.cache config.log config.status ok ok-start
+
+dist-clean: clean
+	rm -rf Makefile
+
+install:
+	mkdir -p $(BIN_DIR)
+	mkdir -p $(DATA_DIR)
+	install -m 755 "$(SRC_DIR)"/dialnetkeeper "$(BIN_DIR)"
+	install -m 755 ok "$(BIN_DIR)"
+	install -m 755 ok-config "$(BIN_DIR)"
+	install -m 755 ok-stop "$(BIN_DIR)"
+	install -m 755 ok-start "$(BIN_DIR)"
+	install -m 755 ok-connect "$(BIN_DIR)"
+	install -m 644 pppoe.conf "$(DATA_DIR)"
+	install -m 644 pap-secrets "$(DATA_DIR)"
+
+uninstall:
+	rm "$(BIN_DIR)"/dialnetkeeper -f
+	rm "$(BIN_DIR)"/ok -f
+	rm "$(BIN_DIR)"/ok-config -f
+	rm "$(BIN_DIR)"/ok-stop -f
+	rm "$(BIN_DIR)"/ok-connect -f
+	rm "$(BIN_DIR)"/ok-start -f
+	rm "$(DATA_DIR)" -rf

Makefile.in

@@ -1,72 +1,30 @@
-#+TITLE: 重庆高校 Linux 上网客户端 openkeeper
-#+STARTUP: content
-
-* 安装
-
-** 安装依赖软件
-
-*** 直接安装
-**** Arch Linux
-#+BEGIN_SRC
-$ yaourt -S openkeeper-cli
-or
-$ wget -c https://github.com/Eventide/openkeeper-cli/raw/master/release/openkeeper-cli-2.0-3-x86_64.pkg.tar
-$ sudo pacman -U openkeeper-cli-2.0-3-x86_64.pkg.tar
-#+END_SRC
-
-**** Ubuntu 
-#+BEGIN_SRC 
-$ wget -c https://github.com/Eventide/openkeeper-cli/raw/master/release/openkeeper-cli-2.0-1.x86_64.deb
-$ sudo apt-get install gdebi-core
-$ sudo gdebi openkeeper-cli-2.0-1-x86_64.deb
-#+END_SRC
-
-*** Fedora
-#+BEGIN_SRC 
-$ wget -c https://github.com/Eventide/openkeeper-cli/raw/master/release/openkeeper-cli-2.0-1.x86_64.rpm
-$ sudo yum install openkeeper-cli-2.0-1-x86_64.rpm
-or
-$ sudo dnf install openkeeper-cli-2.0-1-x86_64.rpm
-#+END_SRC
-
-**** openSUSE 
-#+BEGIN_SRC 
-$ sudo zypper addrepo http://download.opensuse.org/repositories/home:stawidy/openSUSE_Leap_42.1/home:stawidy.repo
-$ sudo zypper refresh
-$ sudo zypper install openkeeper-cli
-#+END_SRC
-
-*** 源码安装
-注意：需要满足 rp-pppoe 、 openssl 依赖。
-#+BEGIN_SRC 
+* 重庆高校 Linux 上网客户端 openkeeper
+** Introduction
+- Netkeeper for Linux.
+** Installation
+#+BEGIN_SRC sh
 $ git clone https://github.com/Eventide/openkeeper-cli.git
 $ cd openkeeper-cli
+$ ./configure --prefix=/usr/local
 $ make 
 $ sudo make install 
 #+END_SRC
-
-* 配置
-** 查看有线网口
-终端执行 =ip link= ，查看输出，有线网口名称一般为 eth0 ， enp1s0 等.
-** 填写配置文件
-#+BEGIN_SRC 
+** Usage
+- Configuration.
+#+BEGIN_SRC sh
 $ sudo ok-config
 #+END_SRC
-
-* 拨号
-#+BEGIN_SRC 
+- Connect.
+#+BEGIN_SRC sh
 $ sudo ok
 #+END_SRC
-* 下线
-#+BEGIN_SRC 
+- Disconnect.
+#+BEGIN_SRC sh
 $ sudo ok-stop
 #+END_SRC
-
-* 卸载
-#+BEGIN_SRC 
-$ cd /tmp/openkeeper-cli && sudo make uninstall
+** Contributors
+#+BEGIN_SRC sh
+Eventide <nanjingzr@yahoo.com>
+RainMark <rain.by.zhou@gmail.com>
+Stawidy  <duyizhaozj321@yahoo.com>
 #+END_SRC
-
-* 问题反馈
-Email: rain_of_mem@163.com\\
-Email: nanjingzr@yahoo.com