Skip to content

Commit

Permalink
v6.29
Browse files Browse the repository at this point in the history
+ DietPi-Software | Steam: Add i386 architecture explicitly, so we do not need to add it by default to x86_64 images and by this prevent certain APT overhead. Install as well modern Nvidia i386 driver libs package if Nvidia driver is installed, so it does not need to be installed via Nvidia driver by default (which as well is not done by choosing Nvidia driver via DietPi-Config!)
+ DietPi-Software | Nvidia driver: Do not install i386 driver/libs by default. Instead install them on demand for i386-only graphics software.
  • Loading branch information
MichaIng authored Mar 7, 2020
1 parent edafa69 commit 93efa92
Showing 1 changed file with 33 additions and 14 deletions.
47 changes: 33 additions & 14 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -1112,8 +1112,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it

aSOFTWARE_NAME[$software_id]='Steam'
aSOFTWARE_DESC[$software_id]='client'
aSOFTWARE_CATEGORY_INDEX[$software_id]=5
aSOFTWARE_TYPE[$software_id]=0
aSOFTWARE_CATEGORY_INDEX[$software_id]=5
aSOFTWARE_ONLINEDOC_URL[$software_id]='p=8016#p8016'
aSOFTWARE_REQUIRES_ALSA[$software_id]=1
aSOFTWARE_REQUIRES_XSERVERXORG[$software_id]=1
Expand Down Expand Up @@ -5645,9 +5645,20 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use it's internal

Banner_Installing

debconf-set-selections <<< 'steam steam/question select I AGREE'
# Enable foreign i386 architecture, since Steam is i386-only: https://packages.debian.org/steam
if [[ $(dpkg --print-foreign-architectures) != *'i386'* ]]; then

dpkg --add-architecture i386
G_AGUP

G_AGI steam
fi

# Add Nvidia i386 driver libs, if Nvidia driver is installed
local nvidia=
dpkg-query -s nvidia-driver &> /dev/null && nvidia='nvidia-driver-libs-i386'

debconf-set-selections <<< 'steam steam/question select I AGREE'
G_AGI steam $nvidia

fi

Expand Down Expand Up @@ -6170,8 +6181,7 @@ Mycroft AI requires at least 2 GiB memory on first start. We will now increase y
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing
# Install + i386 OpenGL
G_AGI nvidia-driver nvidia-xconfig libgl1-nvidia-glx:i386
G_AGI nvidia-driver

fi

Expand Down Expand Up @@ -11783,11 +11793,21 @@ _EOF_

Banner_Configuration

mkdir -p $G_FP_DIETPI_USERDATA/steam
mv /root/.steam/* $G_FP_DIETPI_USERDATA/steam/
rm -R /root/.steam
# Move data dir to dietpi_userdata
if [[ -d $G_FP_DIETPI_USERDATA/steam ]]; then

rm -Rf /root/.steam

ln -sf $G_FP_DIETPI_USERDATA/steam /root/.steam
elif [[ -d '/root/.steam' ]]; then

mv /root/.steam $G_FP_DIETPI_USERDATA/steam

else

mkdir -p $G_FP_DIETPI_USERDATA/steam

fi
ln -s $G_FP_DIETPI_USERDATA/steam /root/.steam

fi

Expand Down Expand Up @@ -13067,11 +13087,11 @@ _EOF_

fi

software_id=151
software_id=151 # Nvidia driver
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then

Banner_Uninstalling
G_AGP nvidia-driver nvidia-xconfig libgl1-nvidia-glx:i386
G_AGP nvidia-driver nvidia-xconfig libgl1-nvidia-glx:i386 nvidia-driver-libs-i386

fi

Expand Down Expand Up @@ -13118,13 +13138,12 @@ _EOF_

fi

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

Banner_Uninstalling
G_AGP steam
rm -R /root/.steam
rm -R $G_FP_DIETPI_USERDATA/steam
rm -Rf /root/.steam $G_FP_DIETPI_USERDATA/steam

fi

Expand Down

0 comments on commit 93efa92

Please sign in to comment.