Compare commits

..

No commits in common. "bb1b2cba154092bd6b0588b0a5aef1b1e032f394" and "10d9c86717e2a4f4337fdb3a19e7239fe7e15791" have entirely different histories.

2 changed files with 3 additions and 12 deletions

View File

@ -82,23 +82,17 @@ if xreadYes "# Create bridges?" BRIDGES ; then
exit 1 exit 1
fi fi
@ cp /etc/network/interfaces{,.bak}
@ cp /etc/network/interfaces{,.new} @ cp /etc/network/interfaces{,.new}
BRIDGES="$(\ BRIDGES="$(\
cat bridges.tpl \ cat bridges.tpl \
| expandPCTTemplate \ | expandPCTTemplate WAN_PORT ADMIN_PORT)"
LAN_BRIDGE WAN_BRIDGE ADMIN_BRIDGE \
WAN_PORT ADMIN_PORT \
HOST_ADMIN_IP GATE_ADMIN_IP)"
if [ -z "$DRY_RUN" ] ; then if [ -z "$DRY_RUN" ] ; then
# XXX add $BRIDGES to /etc/network/interfaces either before the # XXX add $BRIDGES to /etc/network/interfaces either before the
# source command or at the end... # source command or at the end...
# XXX # XXX
echo "$BRIDGES" >> /etc/network/interfaces.new echo
else
echo "$BRIDGES"
fi fi
if reviewApplyChanges /etc/network/interfaces ; then if reviewApplyChanges /etc/network/interfaces ; then

View File

@ -84,11 +84,8 @@ chown $USER:$USER $SERVER_CONFIG
chmod 600 $SERVER_CONFIG chmod 600 $SERVER_CONFIG
# Print profile QRCode... # Print profile QRCode...
PROFILE="ss://$PASSWD@$ENDPOINT:$ENDPOINT_PORT#shadow @ $ENDPOINT"
echo "# Profile:" echo "# Profile:"
qrencode -t UTF8 "$PROFILE" qrencode -t UTF8 "ss://${PASSWD}@$ENDPOINT:$ENDPOINT_PORT#shadow @ $ENDPOINT"
echo "$PROFILE"
echo
# /home/$USER/$SCRIPT # /home/$USER/$SCRIPT