Merge pull request #962 from vfreex/packaging-bash-completion

Package bash completion file

completions/bash/ss-local

@@ -9,7 +9,7 @@ _ss_local()
         -c|-f|--acl)
             _filedir || COMPREPLY=( $(compgen -o plusdirs -f ${cur}) )
             ;;
-        -s|-b|-l)
+        -s|-b)
             _known_hosts_real -- "${cur}" || OMPREPLY=( $(compgen -A hostname -- ${cur}) )
             ;;
         -m)
@@ -18,7 +18,7 @@ _ss_local()
         -a)
             _allowed_users || COMPREPLY=( $(compgen -u -- ${cur}) )
             ;;
-        -p|-k|-t|-n|--mtu)
+        -p|-k|-t|-n|--mtu|-l)
             ;;
         -i)
             _available_interfaces -a || true

completions/bash/ss-manager

@@ -9,7 +9,7 @@ _ss_manager()
         -c|-f|--executable)
             _filedir || COMPREPLY=( $(compgen -o plusdirs -f ${cur}) )
             ;;
-        -s|-b|-l)
+        -s|-b)
             _known_hosts_real -- "${cur}" || OMPREPLY=( $(compgen -A hostname -- ${cur}) )
             ;;
         -L)
@@ -22,7 +22,7 @@ _ss_manager()
         -a)
             _allowed_users || COMPREPLY=( $(compgen -u -- ${cur}) )
             ;;
-        -p|-k|-t|-n|--mtu)
+        -p|-k|-t|-n|--mtu|-l)
             ;;
         -i)
             _available_interfaces -a || true

completions/bash/ss-redir

@@ -9,7 +9,7 @@ _ss_redir()
         -c|-f)
             _filedir || COMPREPLY=( $(compgen -o plusdirs -f ${cur}) )
             ;;
-        -s|-b|-l)
+        -s|-b)
             _known_hosts_real -- "${cur}" || OMPREPLY=( $(compgen -A hostname -- ${cur}) )
             ;;
         -m)
@@ -18,7 +18,7 @@ _ss_redir()
         -a)
             _allowed_users || COMPREPLY=( $(compgen -u -- ${cur}) )
             ;;
-        -p|-k|-t|-n|--mtu)
+        -p|-k|-t|-n|--mtu|-l)
             ;;
         *)
             COMPREPLY+=( $(compgen -W "${opts}" -- ${cur}) )

completions/bash/ss-tunnel

@@ -10,7 +10,7 @@ _ss_tunnel()
         -c|-f)
             _filedir || COMPREPLY=( $(compgen -o plusdirs -f ${cur}) )
             ;;
-        -s|-b|-l)
+        -s|-b)
             _known_hosts_real -- "${cur}" || OMPREPLY=( $(compgen -A hostname -- ${cur}) )
             ;;
         -L)
@@ -23,7 +23,7 @@ _ss_tunnel()
         -a)
             _allowed_users || COMPREPLY=( $(compgen -u -- ${cur}) )
             ;;
-        -p|-k|-t|-n|--mtu)
+        -p|-k|-t|-n|--mtu|-l)
             ;;
         -i)
             _available_interfaces -a || true

debian/shadowsocks-libev.install

@@ -2,3 +2,4 @@ debian/config.json usr/share/shadowsocks-libev
 debian/shadowsocks-libev-*.service lib/systemd/system
 usr/bin/
 usr/share/man/
+completions/bash/* usr/share/bash-completion/completions/

rpm/SPECS/shadowsocks-libev.spec.in

@@ -8,10 +8,10 @@ License:	GPLv3+
 URL:		https://github.com/shadowsocks/%{name}
 Source0:	%{url}/archive/v%{version}.tar.gz
 
-BuildRequires: make automake gcc openssl-devel pcre-devel asciidoc xmlto
+BuildRequires: make gcc openssl-devel pcre-devel asciidoc xmlto
 Requires:	openssl
 
-%if 0%{?rhel} != 6
+%if 0%{?rhel} > 6
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -49,17 +49,18 @@ install -m 644 %{_builddir}/%{buildsubdir}/debian/shadowsocks-libev.service %{bu
 install -m 644 %{_builddir}/%{buildsubdir}/debian/shadowsocks-libev-*.service %{buildroot}%{_unitdir}/
 %endif
 install -m 644 %{_builddir}/%{buildsubdir}/debian/config.json %{buildroot}%{_sysconfdir}/shadowsocks-libev/config.json
-
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
+install -m 644 %{_builddir}/%{buildsubdir}/completions/bash/* %{buildroot}%{_datadir}/bash-completion/completions/
 
 %post
-%if 0%{?rhel} == 6
+%if 0%{?rhel} <= 6
 /sbin/chkconfig --add shadowsocks-libev
 %else
 %systemd_post shadowsocks-libev.service
 %endif
 
 %preun
-%if 0%{?rhel} == 6
+%if 0%{?rhel} <= 6
 if [ $1 -eq 0 ]; then
     /sbin/service shadowsocks-libev stop
     /sbin/chkconfig --del shadowsocks-libev
@@ -68,7 +69,7 @@ fi
 %systemd_preun shadowsocks-libev.service
 %endif
 
-%if 0%{?rhel} != 6
+%if 0%{?rhel} > 6
 %postun
 %systemd_postun_with_restart shadowsocks-libev.service
 %endif
@@ -85,8 +86,9 @@ fi
 %{_bindir}/*
 %{_libdir}/*
 %config(noreplace) %{_sysconfdir}/shadowsocks-libev/config.json
+%{_datadir}/bash-completion/completions/*
 %doc %{_mandir}/*
-%if 0%{?rhel} == 6
+%if 0%{?rhel} <= 6
 %{_initddir}/shadowsocks-libev
 %else
 %{_unitdir}/shadowsocks-libev.service

src/utils.c

@@ -104,7 +104,6 @@ run_as(const char *user)
 {
 #ifndef __MINGW32__
     if (user[0]) {
-        printf("user: %s\n", user);
         /* Convert user to a long integer if it is a non-negative number.
          * -1 means it is a user name. */
         long uid = -1;