Merge pull request #767 from pivpn/test

Test into Master.
This commit is contained in:
4s3ti 2019-06-07 16:30:41 +02:00 committed by GitHub
commit 8e3a951524
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions

View file

@ -1,4 +1,4 @@
##How to contribute to PiVPN
## How to contribute to PiVPN
### **Before Getting Started**

View file

@ -133,7 +133,10 @@ you want to remove OpenVPN without installing a fresh Raspbian image, just run
Feedback & Support
--------
#### Please read carefully the [issue template](https://github.com/pivpn/pivpn/blob/master/ISSUE_TEMPLATE.md) and the [contributors' guide](https://github.com/pivpn/pivpn/blob/master/CONTRIBUTING.md), we will close all incomplete issue templates.
PiVPN is purely community driven, and we are interested in making this script work for as many people as possible, we welcome any feedback on your experience.
Please be respectful and be aware that this is maintained with our free time!
for community support or general questions.
Feel free to post on our subreddit <https://www.reddit.com/r/pivpn/>
@ -143,7 +146,6 @@ For code related issues, code contributions, feature requests, feel free to open
We will classify the issues the best we can to keep things sorted.
Related Projects
--------
[StarshipEngineer/OpenVPN-Setup](https://github.com/StarshipEngineer/OpenVPN-Setup)

View file

@ -1181,7 +1181,8 @@ updatePiVPN() {
displayFinalMessage() {
# Final completion message to user
whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Now run 'pivpn add' to create the ovpn profiles.
Run 'pivpn help' to see what else you can do!" ${r} ${c}
Run 'pivpn help' to see what else you can do!\n\nIf you run into any issue, please read all our documentation carefully.
All incomplete posts or bug reports will be ignored or deleted.\n\nThank you for using PiVPN." ${r} ${c}
if (whiptail --title "Reboot" --yesno --defaultno "It is strongly recommended you reboot after installation. Would you like to reboot now?" ${r} ${c}); then
whiptail --title "Rebooting" --msgbox "The system will now reboot." ${r} ${c}
printf "\nRebooting system...\n"
@ -1233,6 +1234,7 @@ clone_or_update_repos() {
fi
}
######## SCRIPT ############
main() {

View file

@ -20,7 +20,7 @@ printf "\e[1m::: Client Status List :::\e[0m\n"
printf "\t\t\t\t\t\t\t\tBytes\t\tBytes\t\n"
printf "\e[4mName\e[0m\t\t\t\e[4mRemote IP\e[0m\t\t\e[4mVirtual IP\e[0m\t\e[4mReceived\e[0m\t\e[4mSent\e[0m\t\t\e[4mConnected Since\e[0m \n"
if grep -q "^CLIENT_LIST" "${STATUS_LOG}"; then
if [ -n $(type -t numfmt) ]; then
if [ -n "$(type -t numfmt)" ]; then
while read -r line; do
read -r -a array <<< $line
[[ ${array[0]} = CLIENT_LIST ]] || continue