Skip to content

Commit b2b6c64

Browse files
fix radio get mesa version and add mesa-tkg-stable
1 parent 7f4b063 commit b2b6c64

1 file changed

Lines changed: 18 additions & 8 deletions

File tree

usr/share/bigbashview/bcc/apps/drivers/kernel.sh.htm

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
[[ "$mesa" = "mesa" ]] && ./installpkgmesa.sh install "lib32-libva-mesa-driver libva-mesa-driver lib32-mesa mesa"
8585
[[ "$mesa" = "amber" ]] && ./installpkgmesa.sh install "lib32-mesa-amber mesa-amber libva-mesa-driver lib32-libva-mesa-driver"
8686
[[ "$mesa" = "tkg" ]] && ./installpkgmesa.sh install "lib32-mesa-tkg-git mesa-tkg-git"
87+
[[ "$mesa" = "tkgStable" ]] && ./installpkgmesa.sh install "lib32-mesa-tkg-stable mesa-tkg-stable"
8788

8889
cat <<-EOF
8990
<html>
@@ -220,15 +221,18 @@ <h3>$KernelMesaText</h3>
220221
</ul>
221222
EOF
222223

223-
if pacman -Qq 'mesa' &>/dev/null; then
224-
mesaChecked=checked
225-
mesaInstall=y
226-
elif pacman -Qq 'mesa-amber' &>/dev/null; then
224+
if pacman -Qq 'mesa-amber' &>/dev/null; then
227225
mesaAmberChecked=checked
228-
mesaAmberInstall=y
226+
# mesaAmberInstall=y
227+
elif pacman -Qq 'mesa-tkg-stable' &>/dev/null; then
228+
mesaTkgStableChecked=checked
229+
# mesaAmberInstall=y
229230
elif pacman -Qq 'mesa-tkg-git' &>/dev/null; then
230-
mesaAmberInstall=y
231-
mesaTkgChecked=checked
231+
mesaTkgGitChecked=checked
232+
# mesaAmberInstall=y
233+
elif pacman -Qq 'mesa' &>/dev/null; then
234+
mesaChecked=checked
235+
# mesaInstall=y
232236
fi
233237

234238
cat <<-EOF
@@ -248,7 +252,13 @@ <h3>$KernelMesaText</h3>
248252
</label>
249253
</div>
250254
<div class="products">
251-
<input id="r3" type="radio" onclick="disableBodyConfigSimple(); location.href='kernel.sh.htm?mesa=tkg'" $mesaTkgChecked>
255+
<input id="r3" type="radio" onclick="disableBodyConfigSimple(); location.href='kernel.sh.htm?mesa=tkgStable'" $mesaTkgStableChecked>
256+
<label for="r3">
257+
<span style="display: inline-block; position: relative; margin-top: 5px; margin-left: 10px;"><font style="font-weight: 700;">Tkg-Stable</font><br><font style="font-weight: 300;">$(LANG=en pacman -Si mesa-tkg-stable | grep -i "^Version" | cut -f2 -d: | head -n1)</font></span>
258+
</label>
259+
</div>
260+
<div class="products">
261+
<input id="r3" type="radio" onclick="disableBodyConfigSimple(); location.href='kernel.sh.htm?mesa=tkg'" $mesaTkgGitChecked>
252262
<label for="r3">
253263
<span style="display: inline-block; position: relative; margin-top: 5px; margin-left: 10px;"><font style="font-weight: 700;">Tkg-git</font><br><font style="font-weight: 300;">$(LANG=en pacman -Si mesa-tkg-git | grep -i "^Version" | cut -f2 -d: | sed 's|_devel||g' | rev | cut -d"." -f 2- | rev)</font></span>
254264
</label>

0 commit comments

Comments
 (0)