Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-22 15:16:58 +00:00
Code Releases Activity

Turn off errexit option when detecting the apg command

Browse Source 
Commit https://github.com/shadowsocks/shadowsocks-libev/commit/f32ac38c2f7aab09ec25131209954957518de42a
allows to use pwgen to generate the initial password at the first
installation. However it won't work when apg isn't installed because:

* the postinst script has errexit option set ("set -e")
* at the first installation of ss-libev, apg or pwgen will be called to
  generate the initial password in config.json
* when apg isn't installed, "pathfind apg" would return 1
* and the postinst script will immediately exit due to "set -e"

This commit temporarily turn off the errexit option for pathfind()
This commit is contained in:
Rick Lei
2017-03-09 12:48:37 +08:00
committed by Max Lv
parent e1027a7c56
commit e63de4ce23
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/shadowsocks-libev.postinst
Vendored
+2
View File
@@ -26,12 +26,14 @@ case "$1" in
cap_net_bind_service+ep /usr/bin/ss-server \
cap_net_bind_service+ep /usr/bin/ss-tunnel
if [ ! -f /etc/shadowsocks-libev/config.json ]; then
set +e
pathfind apg
if [ $? -eq 0 ]; then
passwd=$(apg -n 1 -M ncl)
else
passwd=$(pwgen 12 1)
fi
set -e
mkdir -p /etc/shadowsocks-libev
sed "s/barfoo!/$passwd/" /usr/share/shadowsocks-libev/config.json \
> /etc/shadowsocks-libev/config.json