Skip to content

Commit

Permalink
v154
Browse files Browse the repository at this point in the history
+ DietPi-Software | Steam: Now available for installation (Native PC
only): https://github.com/Fourdee/DietPi/issues/1062

+ DietPi-Software | Nvidia driver: Also installs i386 OpenGL.
  • Loading branch information
Fourdee committed Jul 18, 2017
1 parent ec8e0f7 commit ff67231
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 35 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ DietPi-Config | Display > Resolution: Added ability to change overscan values fo
DietPi-Software | Avahi-Daemon (additional Linux software): Now available for installation. Provides hostname broadcasting, supported by MacOSX and PC clients with Bonjour service: https://github.com/Fourdee/DietPi/issues/1030
DietPi-Software | OctoPrint: Now available for installation. 3D printing with web interface: https://github.com/Fourdee/DietPi/issues/854
DietPi-Software | RoonServer: Now available for installation. x86_64 native PC only: https://github.com/Fourdee/DietPi/issues/1060
DietPi-Software | Nvidia driver: Now also installs i386 OpenGL.
DietPi-Software | HTPC Manager: Now available for installation. Many thanks to @sytone for implementing the software!: https://github.com/Fourdee/DietPi/pull/1083
DietPi-Software | Steam: Now available for installation (Native PC only): https://github.com/Fourdee/DietPi/issues/1062

Bug fixes:
General | RPi Stretch: /etc/apt/sources.list.d/raspi.list now uses correct stretch repo. Many thanks to @MichaIng for the fix: https://github.com/Fourdee/DietPi/issues/1077
Expand Down
92 changes: 57 additions & 35 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -1244,6 +1244,26 @@ _EOF_
aSOFTWARE_ONLINEDOC_URL[$index_current]='f=8&t=5&start=60#p2069'

#------------------
index_current=156

aSOFTWARE_WHIP_NAME[$index_current]='Steam'
aSOFTWARE_WHIP_DESC[$index_current]='client'
aSOFTWARE_CATEGORY_INDEX[$index_current]=5
aSOFTWARE_TYPE[$index_current]=0
aSOFTWARE_ONLINEDOC_URL[$index_current]='f=8&t=5&p=8016#p8016'
aSOFTWARE_REQUIRES_ALSA[$index_current]=1
aSOFTWARE_REQUIRES_XSERVERXORG[$index_current]=1
aSOFTWARE_REQUIRES_DESKTOP[$index_current]=1

#Native PC only
for ((i=0; i<=$MAX_HW_MODEL; i++))
do

aSOFTWARE_AVAIL_HW_MODEL[$index_current,$i]=0

done

aSOFTWARE_AVAIL_HW_MODEL[$index_current,21]=1

#Social Media
#--------------------------------------------------------------------------------
Expand Down Expand Up @@ -6704,6 +6724,18 @@ _EOF_

fi

#Steam
INSTALLING_INDEX=156
if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then

Banner_Installing

debconf-set-selections <<< "steam steam/question select I AGREE"

AGI steam

fi

}

Install_Linux_Software(){
Expand Down Expand Up @@ -6849,6 +6881,9 @@ _EOF_

AGI nvidia-driver nvidia-xconfig

# + i386 OpenGL
AGI libgl1-nvidia-glx:i386

fi

#Avahi-Daemon
Expand Down Expand Up @@ -11060,6 +11095,18 @@ ExecStart=/mnt/dietpi_userdata/roonserver/start.sh
WantedBy=multi-user.target
_EOF_

fi

#Steam
INSTALLING_INDEX=156
if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then

mkdir -p "$FP_DIETPI_USERDATA_DIRECTORY"/steam
mv "$HOME"/.steam/* "$FP_DIETPI_USERDATA_DIRECTORY"/steam/
rm -R "$HOME"/.steam

ln -sf "$FP_DIETPI_USERDATA_DIRECTORY"/steam "$HOME"/.steam

fi
#-------------------------------------------------------------------

Expand Down Expand Up @@ -11493,7 +11540,7 @@ _EOF_

elif (( $1 == 151 )); then

AGP nvidia-driver nvidia-xconfig
AGP nvidia-driver nvidia-xconfig libgl1-nvidia-glx:i386

elif (( $1 == 152 )); then

Expand All @@ -11511,6 +11558,12 @@ _EOF_
rm -R "$FP_DIETPI_USERDATA_DIRECTORY"/roonserver
rm /etc/systemd/system/roonserver.service

elif (( $1 == 156 )); then

AGP steam
rm -R "$HOME"/.steam
rm -R "$FP_DIETPI_USERDATA_DIRECTORY"/steam

elif (( $1 == 119 )); then

AGP cava
Expand Down Expand Up @@ -13956,7 +14009,7 @@ _EOF_

#-----------------------------------------------------------------------------
#dietpi-config can be used to install/configure the following software. Ask user.
#NoIp -
#NoIp
if (( ${aSOFTWARE_INSTALL_STATE[67]} == 1 )); then

WHIP_TITLE='NoIp - Setup Now?'
Expand All @@ -13978,38 +14031,6 @@ _EOF_

fi

#-----------------------------------------------------------------------------
#Installations that might require File server to access data.
#Lets inform the user of File Server option
# local inform_user_fileserver=0
# if (( $INDEX_FILESERVER_TARGET == 0 )); then
# if (( $TRANSMISSION == 1 )); then
# inform_user_fileserver=1
# elif (( $DELUGE == 1 )); then
# inform_user_fileserver=1
# elif (( $MINIDLNA == 1 )); then
# inform_user_fileserver=1
# elif (( $HIFI == 1 )); then
# inform_user_fileserver=1
# elif (( $SQUEEZEBOXSERVER == 1 )); then
# inform_user_fileserver=1
# elif (( $SUBSONIC5 == 1 || $SUBSONIC6 == 1 )); then
# inform_user_fileserver=1
# elif (( $AMPACHE == 1 )); then
# inform_user_fileserver=1
# elif (( $EMBYSERVER == 1 )); then
# inform_user_fileserver=1
# elif (( $PLEXMEDIASERVER == 1 )); then
# inform_user_fileserver=1
# fi

# if (( $inform_user_fileserver == 1 )); then
# WHIP_TITLE='File Server Recommended'
# WHIP_QUESTION="Your installation choices may benefit from a File Server. This would allow you to access and transfer files on this DietPi system.\n\nWhen you return to the main menu, select:\n- File Server\n\nThis will allow you to see the complete list of available fileserver choices."
# whiptail --title "$WHIP_TITLE" --msgbox "$WHIP_QUESTION" --backtitle "$WHIP_BACKTITLE" 16 70
# fi
# fi

#-----------------------------------------------------------------------------
#Boot Choices
if (( ${aSOFTWARE_INSTALL_STATE[23]} == 1 ||
Expand All @@ -14020,7 +14041,8 @@ _EOF_
${aSOFTWARE_INSTALL_STATE[51]} == 1 ||
${aSOFTWARE_INSTALL_STATE[108]} == 1 ||
${aSOFTWARE_INSTALL_STATE[112]} == 1 ||
${aSOFTWARE_INSTALL_STATE[119]} == 1 )); then
${aSOFTWARE_INSTALL_STATE[119]} == 1 ||
${aSOFTWARE_INSTALL_STATE[155]} == 1 )); then

# Set Boot Order
WHIP_TITLE=' DietPi - Boot Options'
Expand Down

0 comments on commit ff67231

Please sign in to comment.