Unverified Commit 390c7cdb authored by Igor Pečovnik's avatar Igor Pečovnik Committed by GitHub
Browse files

Merge pull request #19 from nachoparker/development

added NextCloudPlus to softy
parents 2039b519 b6d2249d
...@@ -121,7 +121,9 @@ if [[ "$(dpkg --print-architecture)" == "armhf" || "$(dpkg --print-architecture) ...@@ -121,7 +121,9 @@ if [[ "$(dpkg --print-architecture)" == "armhf" || "$(dpkg --print-architecture)
VPN_CLIENT_STATUS="$([[ -d /usr/local/vpnclient ]] && echo "on" || echo "off" )" VPN_CLIENT_STATUS="$([[ -d /usr/local/vpnclient ]] && echo "on" || echo "off" )"
LIST+=( "VPN client" "Softether VPN client" "$VPN_CLIENT_STATUS" ) LIST+=( "VPN client" "Softether VPN client" "$VPN_CLIENT_STATUS" )
fi fi
# NCP
NCP_STATUS="$( [[ -d /var/www/nextcloud ]] && echo "on" || echo "off" )"
[[ "$family" != "Ubuntu" ]] && LIST+=( "NCP" "Nextcloud personal cloud" "$NCP_STATUS" )
# OMV # OMV
OMV_STATUS="$(check_if_installed openmediavault && echo "on" || echo "off" )" OMV_STATUS="$(check_if_installed openmediavault && echo "on" || echo "off" )"
[[ "$family" != "Ubuntu" ]] && LIST+=( "OMV" "OpenMediaVault NAS solution" "$OMV_STATUS" ) && LIST_CONST=3 [[ "$family" != "Ubuntu" ]] && LIST+=( "OMV" "OpenMediaVault NAS solution" "$OMV_STATUS" ) && LIST_CONST=3
...@@ -460,8 +462,9 @@ if [[ $? = 0 ]]; then ...@@ -460,8 +462,9 @@ if [[ $? = 0 ]]; then
fi fi
} }
install_ncp (){
curl -sSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh | bash
}
install_omv (){ install_omv (){
# #
...@@ -1480,6 +1483,10 @@ while true; do ...@@ -1480,6 +1483,10 @@ while true; do
install_vpn_client install_vpn_client
selection=${selection//\"VPN client\"/} selection=${selection//\"VPN client\"/}
fi fi
if [[ "$selection" == *NCP* && "$NCP_STATUS" != "on" ]]; then
install_ncp
selection=${selection//NCP/}
fi
if [[ "$selection" == *OMV* && "$OMV_STATUS" != "on" ]]; then if [[ "$selection" == *OMV* && "$OMV_STATUS" != "on" ]]; then
install_omv install_omv
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment