host/make.sh

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

shadow/templates/root/update-shadowsocks.sh

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