Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Links in dietpi-software changed from phpBB to dietpi.com/docs #4042

Merged
merged 3 commits into from
Jan 6, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -16553,15 +16553,15 @@ _EOF_
if (( ${aSOFTWARE_INSTALL_STATE[68]} == 1 )); then

G_WHIP_MSG 'Remot3.it requires you to create an online account, and, link it this device.
\nOnce DietPi has completed your software installations, and rebooted, please follow the First Run tutorial link below:\nhttps://dietpi.com/phpbb/viewtopic.php?p=188#p188'
\nOnce DietPi has completed your software installations, and rebooted, please follow the First Run tutorial link below:\nhttps://dietpi.com/docs/software/remote_desktop/#remot3it'

fi

# Let's Encrypt
if (( ${aSOFTWARE_INSTALL_STATE[92]} == 1 )); then

G_WHIP_MSG 'The DietPi installation of Certbot supports all offered web servers.\n\nOnce the installation has finished, you can setup your free SSL cert with:
- DietPi-LetsEncrypt\n\nThis is a easy to use frontend for Certbot and allows integration into DietPi systems.\n\nMore information:\n - https://dietpi.com/phpbb/viewtopic.php?p=1062#p1062'
- DietPi-LetsEncrypt\n\nThis is a easy to use frontend for Certbot and allows integration into DietPi systems.\n\nMore information:\n - https://dietpi.com/docs/software/system_security/#lets-encrypt'

fi

Expand All @@ -16570,7 +16570,7 @@ _EOF_
if (( ${aSOFTWARE_INSTALL_STATE[67]} == 1 )); then

if G_WHIP_YESNO 'No-IP can be setup and configured by using DietPi-Config. Would you like to complete this now?\n\n - Once finished, exit DietPi-Config to resume setup.
\n - More information:\nhttps://dietpi.com/phpbb/viewtopic.php?p=58#p58'; then
\n - More information:\nhttps://dietpi.com/docs/software/advanced_networking/#no-ip'; then

# Write installed states to temp
Write_InstallFileList temp
Expand Down Expand Up @@ -16819,7 +16819,7 @@ _EOF_
\n- None: Select this option if you do NOT require a method of accessing files and folders on this device, over a network.
\n- ProFTPD (Recommended for RPi v1): Allows you to access/share files on this device efficiently with minimal cpu usage. Uses FTP protocol.
\n- Samba (Recommended for RPi v2): Allows you to easily access/share files on this device, at the cost of higher cpu usage.
\nMore info: https://dietpi.com/phpbb/viewtopic.php?p=19#p19'; then
\nMore info: https://dietpi.com/docs/dietpi_tools/#quick-selections'; then

# Assign target index
if [[ $G_WHIP_RETURNED_VALUE == 'None' ]]; then
Expand Down Expand Up @@ -16932,7 +16932,7 @@ _EOF_

G_WHIP_BUTTON_CANCEL_TEXT='Back'
if G_WHIP_MENU 'Choose where to store your user data. User data includes software such as ownCloud data store, BitTorrent downloads etc.
\nMore information on user data in DietPi:\n- https://dietpi.com/phpbb/viewtopic.php?p=2087
\nMore information on user data in DietPi:\n- https://dietpi.com/docs/dietpi_tools/#quick-selections
\n- DietPi-Drive_Manager: Launch DietPi-Drive_Manager to setup external drives, and, move user data to different locations.'; then

# DriveMan
Expand Down Expand Up @@ -17004,7 +17004,7 @@ _EOF_

G_WHIP_DEFAULT_ITEM=$index_webserver_text
G_WHIP_BUTTON_CANCEL_TEXT='Back'
if G_WHIP_MENU 'Please select a Webserver preference, more info https://dietpi.com/phpbb/viewtopic.php?p=1549#p1549:
if G_WHIP_MENU 'Please select a Webserver preference, more info https://dietpi.com/docs/dietpi_tools/#quick-selections:
\n- Apache2: Feature-rich and popular. Recommended for beginners and users who are looking to follow Apache2 based guides.
\n- Nginx: Lightweight alternative to Apache2. Nginx claims faster webserver performance compared to Apache2.
\n- Lighttpd: Extremely lightweight and is generally considered to offer the \"best\" webserver performance for SBCs. Recommended for users who expect low webserver traffic.'; then
Expand Down Expand Up @@ -17094,30 +17094,25 @@ _EOF_
Welcome to DietPi:
───────────────────────────────────────────────────────────────
Use PageUp/Down or Arrow Up/Down to scroll this help screen.
Press ESC, or TAB then enter to exit this help screen.\n
Press ESC, or TAB then ENTER to exit this help screen.\n
Easy to follow, step by step guides for installing DietPi:
https://dietpi.com/phpbb/viewtopic.php?f=8&t=9\n
https://dietpi.com/docs/user-guide_installation/\n
For a list of all installation options and their details:
https://dietpi.com/software\n
https://dietpi.com/docs/dietpi_optimised_software/\n
───────────────────────────────────────────────────────────────
List of installed software and their URL links for online docs:
List of installed software and their online documentation URLs:
───────────────────────────────────────────────────────────────\n'

# Installed software
for i in "${!aSOFTWARE_INSTALL_STATE[@]}"
do

if (( ${aSOFTWARE_INSTALL_STATE[i]} > 0 )) && [[ ${aSOFTWARE_ONLINEDOC_URL[$i]} ]]; then

string+="\n${aSOFTWARE_NAME[$i]}: ${aSOFTWARE_DESC[$i]}\n$FP_ONLINEDOC_URL${aSOFTWARE_ONLINEDOC_URL[$i]}\n"

fi

# shellcheck disable=SC2015
(( ${aSOFTWARE_INSTALL_STATE[i]} > 0 )) && [[ ${aSOFTWARE_ONLINEDOC_URL[$i]} ]] || continue
string+="\n${aSOFTWARE_NAME[$i]}: ${aSOFTWARE_DESC[$i]}\n$FP_ONLINEDOC_URL${aSOFTWARE_ONLINEDOC_URL[$i]}\n"
done

G_WHIP_SIZE_X_MAX=70
G_WHIP_MSG "$string"
unset string

;;

Expand Down