v127

+ DietPi-Software re-code to array:
https://github.com/Fourdee/DietPi/issues/453

CHANGELOG.txt

@@ -1,7 +1,10 @@
 v127
-(xx/07/16)
+(xx/08/16)
 
 Changes / Improvements / Optimizations:
+Wheezy code has been removed
+DietPi-Software | Major (if somewhat long overdue) coding overhaul: https://github.com/Fourdee/DietPi/issues/453
+DietPi-Uninstall | Removed. Software can now be uninstalled from DietPi-Software
 
 Bug fixes:
 

dietpi.txt

@@ -35,110 +35,14 @@ Swapfile_Size=100
 # 1=Automated installation with no user inputs.
 AUTO_Install_Index=0
 
-#DietPi-Optimized Software to automatically install. | requires AUTO_Install_Index=1
-# 1=install
-AUTO_DietpiSoftware_Install_DESKTOP_LXDE=0
-AUTO_DietpiSoftware_Install_DESKTOP_MATE=0
-AUTO_DietpiSoftware_Install_DESKTOP_GNUSTEP=0
-AUTO_DietpiSoftware_Install_DESKTOP_XFCE=0
-AUTO_DietpiSoftware_Install_TIGHTVNCSERVER=0
-AUTO_DietpiSoftware_Install_VNC4SERVER=0
-AUTO_DietpiSoftware_Install_OWNCLOUD=0
-AUTO_DietpiSoftware_Install_TRANSMISSION=0
-AUTO_DietpiSoftware_Install_PHPBB=0
-AUTO_DietpiSoftware_Install_HIFI=0
-AUTO_DietpiSoftware_Install_KODI=0
-AUTO_DietpiSoftware_Install_MINIDLNA=0
-AUTO_DietpiSoftware_Install_OPENTYRIAN=0
-AUTO_DietpiSoftware_Install_DIETPICAM=0
-AUTO_DietpiSoftware_Install_DELUGE=0
-AUTO_DietpiSoftware_Install_RASPCONTROL=0
-AUTO_DietpiSoftware_Install_LINUXDASH=0
-AUTO_DietpiSoftware_Install_NETDATA=0
-AUTO_DietpiSoftware_Install_PIHOLE=0
-AUTO_DietpiSoftware_Install_SUBSONIC5=0
-AUTO_DietpiSoftware_Install_SUBSONIC6=0
-AUTO_DietpiSoftware_Install_WEAVED=0
-AUTO_DietpiSoftware_Install_WEBIOPI=0
-AUTO_DietpiSoftware_Install_DIETPICLOUDSHELL=0
-AUTO_DietpiSoftware_Install_HAPROXY=0
-AUTO_DietpiSoftware_Install_SQUEEZEBOXSERVER=0
-AUTO_DietpiSoftware_Install_WORDPRESS=0
-AUTO_DietpiSoftware_Install_FAIL2BAN=0
-AUTO_DietpiSoftware_Install_PHPSYSINFO=0
-AUTO_DietpiSoftware_Install_PHPIMAGEGALLERY=0
-AUTO_DietpiSoftware_Install_AMPACHE=0
-AUTO_DietpiSoftware_Install_OPENVPNSERVER=0
-AUTO_DietpiSoftware_Install_LETSENCRYPT=0
-AUTO_DietpiSoftware_Install_WIRINGPI=0
-AUTO_DietpiSoftware_Install_RPIGPIO=0
-AUTO_DietpiSoftware_Install_RPII2C=0
-
-# - Webserver stacks.
-AUTO_DietpiSoftware_Install_WEBSERVER_LAMP=0
-AUTO_DietpiSoftware_Install_WEBSERVER_LASP=0
-AUTO_DietpiSoftware_Install_WEBSERVER_LAAP=0
-
-AUTO_DietpiSoftware_Install_WEBSERVER_LEMP=0
-AUTO_DietpiSoftware_Install_WEBSERVER_LESP=0
-AUTO_DietpiSoftware_Install_WEBSERVER_LEAP=0
-
-AUTO_DietpiSoftware_Install_WEBSERVER_LLMP=0
-AUTO_DietpiSoftware_Install_WEBSERVER_LLSP=0
-AUTO_DietpiSoftware_Install_WEBSERVER_LLAP=0
-
-AUTO_DietpiSoftware_Install_WEBSERVER_MYADMINPHP=0
-AUTO_DietpiSoftware_Install_WEBSERVER_REDIS=0
-
-AUTO_DietpiSoftware_Install_WIFIHOTSPOT=0
-AUTO_DietpiSoftware_Install_TORHOTSPOT=0
-AUTO_DietpiSoftware_Install_SHAIRPORTSYNC=0
-AUTO_DietpiSoftware_Install_BRUTEFIR=0
-AUTO_DietpiSoftware_Install_PYDIO=0
-AUTO_DietpiSoftware_Install_SQUEEZELITE=0
-AUTO_DietpiSoftware_Install_RPIMONITOR=0
-AUTO_DietpiSoftware_Install_EMONHUB=0
-AUTO_DietpiSoftware_Install_MUMBLESERVER=0
-AUTO_DietpiSoftware_Install_EMBYSERVER=0
-AUTO_DietpiSoftware_Install_OPENBAZAAR=0
-AUTO_DietpiSoftware_Install_PLEXMEDIASERVER=0
-AUTO_DietpiSoftware_Install_XRDP=0
-AUTO_DietpiSoftware_Install_NOMACHINE=0
-AUTO_DietpiSoftware_Install_CUBERITE=0
-AUTO_DietpiSoftware_Install_MINEOS=0
-AUTO_DietpiSoftware_Install_GOGS=0
-AUTO_DietpiSoftware_Install_QBITTORRENT=0
-AUTO_DietpiSoftware_Install_SYNCTHING=0
-
-
-#Linux Additional Software to automatically install | requires AUTO_Install_Index=1
-# 1=install
-AUTO_DietpiSoftware_Install_VIMFULL=0
-AUTO_DietpiSoftware_Install_SSHCLIENT=0
-# - This will be automatically mounted to /mnt/samba. Use DietPi-Config settings section in this file to enter your details (SambaClient_*)
-AUTO_DietpiSoftware_Install_SMBCLIENT=0
-# - This will be automatically mounted to /mnt/ftp_client. Use DietPi-Config settings section in this file to enter your details (curlftpfs_*)
-AUTO_DietpiSoftware_Install_CURLFTPFS=0
-AUTO_DietpiSoftware_Install_GITCLIENT=0
-AUTO_DietpiSoftware_Install_BUILDESSENTIAL=0
-AUTO_DietpiSoftware_Install_ALSABASE=0
-AUTO_DietpiSoftware_Install_XSERVERXORG=0
-AUTO_DietpiSoftware_Install_FFMPEG=0
-AUTO_DietpiSoftware_Install_ORACLEJAVA=0
-AUTO_DietpiSoftware_Install_NODEJS=0
-AUTO_DietpiSoftware_Install_VIFM=0
-AUTO_DietpiSoftware_Install_QUITERSS=0
-AUTO_DietpiSoftware_Install_GNUEMACS=0
-AUTO_DietpiSoftware_Install_JED=0
-AUTO_DietpiSoftware_Install_VIMTINY=0
-AUTO_DietpiSoftware_Install_MIDNIGHTCOMMANDER=0
-AUTO_DietpiSoftware_Install_IFTOP=0
-AUTO_DietpiSoftware_Install_IPTRAF=0
-AUTO_DietpiSoftware_Install_IPERF=0
-AUTO_DietpiSoftware_Install_MTRTINY=0
-AUTO_DietpiSoftware_Install_NLOAD=0
-AUTO_DietpiSoftware_Install_TCPDUMP=0
-AUTO_DietpiSoftware_Install_LOGGING_RSYSLOG=0
+#DietPi-Software to automatically install. | requires AUTO_Install_Index=1
+#For a list of software index's (ID's), run '/DietPi/dietpi/dietpi-software list'
+#No limit on number entires, add as many as you need and uncomment the line.
+#DietPi will automatically install all pre-reqs (eg: ALSA/XSERVER for desktops etc)
+# Examples:
+#AUTO_DietpiSoftware_Install_ID=23 #will install Desktop LXDE
+#AUTO_DietpiSoftware_Install_ID=74 #will install LAMP webserver stack
+#AUTO_DietpiSoftware_Install_ID=44 #will install Bittorrent transmission
 
 #DietPi-Software Choice System
 #SSH Server Selection:
@@ -152,10 +56,6 @@ AUTO_DietpiSoftware_SSHServerIndex=-1
 # -1=proftp
 # -2=samba
 AUTO_DietpiSoftware_FileServerIndex=0
-# NB: If using any FILESERVER_* below, set AUTO_DietpiSoftware_FileServerIndex=0
-AUTO_DietpiSoftware_Install_FILESERVER_PROFTP=0
-AUTO_DietpiSoftware_Install_FILESERVER_SAMBA=0
-AUTO_DietpiSoftware_Install_FILESERVER_VSFTPD=0
 
 #Logging Mode Selection:
 # 0=none/manual

dietpi/dietpi-config

@@ -1646,7 +1646,7 @@
  #dhclient -r
 
  #Drop Connections
- echo -e "\n - Dropping connections.."
+ /DietPi/dietpi/func/dietpi-notify 2 "Dropping connections, please wait..."
  ifdown eth$ETH_INDEX &> /dev/null
  ifdown wlan$WIFI_INDEX &> /dev/null
 
@@ -3226,54 +3226,63 @@ _EOF_
  local sambaclient_mounted_size="unknown"
  local sambaclient_mounted_used="unknown"
  local sambaclient_mounted_free="unknown"
- if (( ${SMBCLIENT:=0} == 2 )); then
+ if (( ${aSOFTWARE_INSTALL_STATE[1]:=0} == 2 )); then
 
  sambaclient_installed=1
  sambaclient_status="Unable to connect and/or incorrect details"
  sambaclient_menutext="Input/Modify Details"
 
  #Check if mount exists and is valid
  if (( $(df -h | grep -ci -m1 '/mnt/samba') == 1 )); then
+
  #Get stats
  sambaclient_mounted_size=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $2 }')
  sambaclient_mounted_used=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $3 }')
  sambaclient_mounted_free=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $4 }')
  sambaclient_status="/mnt/samba | Size $sambaclient_mounted_size | Used $sambaclient_mounted_used | Free $sambaclient_mounted_free"
+
  fi
+
  fi
 
  #ftp Client mount, curlftpfs
  local curlftpfs_installed=0
  local curlftpfs_status="Not Installed"
  local curlftpfs_menutext="Install now to access FTP as filesystem mount"
- if (( ${CURLFTPFS:=0} == 2 )); then
+ if (( ${aSOFTWARE_INSTALL_STATE[2]:=0} == 2 )); then
 
  curlftpfs_installed=1
  curlftpfs_status="Unable to connect and/or incorrect details"
  curlftpfs_menutext="Input/Modify Details"
 
  #Check if mount exists and is valid
  if (( $(df -h | grep -ci -m1 '/mnt/ftp_client') == 1 )); then
+
  #Get stats
  curlftpfs_status="/mnt/ftp_client | Connected"
+
  fi
+
  fi
 
  #NoIp Client
  local noip_installed=0
  local noip_status="Not Installed"
  local noip_menutext="Install No-Ip now"
- if (( ${NOIPDYNDNS:=0} == 2 )); then
+ if (( ${aSOFTWARE_INSTALL_STATE[67]:=0} == 2 )); then
 
  noip_installed=1
  noip_status="Offline - Please Enter No-Ip Details"
  noip_menutext="Enter/Setup NoIp Details"
 
  #Check if noip is running (indicates login details are valid)
  if (( $(ps aux | grep -ci -m1 '/usr/local/bin/[n]oip2') == 1 )); then
+
  noip_status="Online / Active"
  noip_menutext="Change NoIp Details"
+
  fi
+
  fi
 
  WHIP_TITLE='DietPi - Network Options: NAS/Misc'
@@ -3295,7 +3304,7 @@ _EOF_
  if (( $CHOICE == 0 )); then
 
  #install smbclient
- /DietPi/dietpi/dietpi-software install SMBCLIENT
+ /DietPi/dietpi/dietpi-software install 1
 
  fi
 
@@ -3317,7 +3326,7 @@ _EOF_
  if (( $CHOICE == 0 )); then
 
  #install curlftpfs
- /DietPi/dietpi/dietpi-software install CURLFTPFS
+ /DietPi/dietpi/dietpi-software install 2
 
  fi
 
@@ -3340,7 +3349,7 @@ _EOF_
  if (( $CHOICE == 0 )); then
 
  #Install
- /DietPi/dietpi/dietpi-software install NOIPDYNDNS
+ /DietPi/dietpi/dietpi-software install 67
 
  fi
 

dietpi/dietpi-launcher

@@ -38,7 +38,6 @@
 
  option_name+=("" "────Install Optimized Software───────────────────");((index++))
  option_name+=("DietPi-Software" "Install optimized software thats ready to run.");((index++))
- option_name+=("DietPi-Uninstall" "Remove installed software from your system.");((index++))
  option_name+=("" "────Configuration────────────────────────────────");((index++))
  option_name+=("DietPi-Config" "Feature rich config tool for your device.");((index++))
  option_name+=("DietPi-AutoStart" "Choose what software runs after boot.");((index++))

dietpi/dietpi-obtain_hw_model

@@ -30,7 +30,7 @@
  # HW_MODEL_DESCRIPTION
  # - Line3 -
  # DISTRO 0 unknown
- # DISTRO 1 Debian Wheezy
+ # DISTRO 1 Debian Wheezy (No longer supported, http://dietpi.com/phpbb/viewtopic.php?f=9&t=432#p1898)
  # DISTRO 2 Ubuntu 14.04 (No longer supported, left in for user message during update)
  # DISTRO 3 Jessie
  # - Line4 -

dietpi/dietpi-services

@@ -82,13 +82,16 @@
  do
 
  if [ -f /etc/systemd/system/"${aSERVICE_NAME[$i]}".service ]; then
+
  aSERVICE_AVAILABLE[$i]=1
 
  elif [ -f /etc/init.d/"${aSERVICE_NAME[$i]}" ]; then
+
  aSERVICE_AVAILABLE[$i]=1
 
  # - Check dpkg for matching packages.
  elif (( $(grep -ci -m1 "${aSERVICE_NAME[$i]}$" "$FP_TEMP") == 1 )); then
+
  aSERVICE_AVAILABLE[$i]=1
 
  fi