add dialog y/n

OpenMandrivaSoftware · Sep 25, 2024 · 2ca7490 · 2ca7490
1 parent e9c4946
commit 2ca7490
Show file tree

Hide file tree

Showing 37 changed files with 169 additions and 69 deletions.
diff --git a/usr/share/om-welcome/apps-gaming.sh.htm b/usr/share/om-welcome/apps-gaming.sh.htm
@@ -95,8 +95,8 @@
 				<span><a class="title" target="hidden" href=./apps/install-warzone.run>$titlewarzone</a></span><br/>$descwarzone</p>
 			</li>
 			<li>
-				<p><a class="title" target="hidden" href=./apps/install-endlesssky.run><img src="images/endlesssky.png" class="alignleft"/>
-				<span><a class="title" target="hidden" href=./apps/install-endlesssky.run>$titleendlesssky</a></span><br/>$descendlesssky</p>
+				<p><a class="title" target="hidden" href=./apps/install-endless-sky.run><img src="images/endlesssky.png" class="alignleft"/>
+				<span><a class="title" target="hidden" href=./apps/install-endless-sky.run>$titleendlesssky</a></span><br/>$descendlesssky</p>
 			</li>
 			<li>
 				<p><a class="title" target="hidden" href=./apps/install-kubrick.run><img src="images/kubrick.svg" class="alignleft"/>

diff --git a/usr/share/om-welcome/apps/drakuser.run b/usr/share/om-welcome/apps/drakuser.run
@@ -1,4 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 . /usr/share/htmlscript/helpers
-install_if_needed kuser
-pkexec kuser
+if which kuser &>/dev/null; then
+	exec kuser
+else
+	APP=$"Kuser"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
+	pkexec dnf install --assumeyes kuser
+	ProgressDialog --close
+	if which kuser &>/dev/null; then
+		kdialog --title $"OpenMandriva" --msgbox $"Installation succeeded."
+	else
+		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
+	fi
+fi
+fi
diff --git a/usr/share/om-welcome/apps/install-blinken.run b/usr/share/om-welcome/apps/install-blinken.run
@@ -1,5 +1,7 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
+
+if which blinken &>/dev/null; then
 	exec blinken
 else
 	APP=$"Blinken"

diff --git a/usr/share/om-welcome/apps/install-codecs.run b/usr/share/om-welcome/apps/install-codecs.run
@@ -3,10 +3,10 @@
 if rpm -q x264 &>/dev/null; then
 	kdialog --title $"OpenMandriva"  --msgbox  $" Codecs are already installed.";
 else
-	enable-repo restricted
 	APP=$"Codecs"
 	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
     ProgressDialog $"Installing $APP"
+	enable-repo restricted
 	pkexec dnf --refresh install --assumeyes lib64dvdcss2 faac flac x264 lib64xvid4 lib64dca0 x265 kf6-kimageformats-heif
 	ProgressDialog --close
 	if rpm -q x264 &>/dev/null; then

diff --git a/usr/share/om-welcome/apps/install-endless-sky.run b/usr/share/om-welcome/apps/install-endless-sky.run
@@ -1,7 +1,7 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which endless-sky &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"Endless Sky is already installed."
+	exec endless-sky
 else
 	APP=$"Endless Sky"
 	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then

diff --git a/usr/share/om-welcome/apps/install-gnomeshell.run b/usr/share/om-welcome/apps/install-gnomeshell.run
@@ -4,10 +4,10 @@
 if rpm -q task-gnome &>/dev/null; then
 	kdialog --title $"OpenMandriva" --msgbox $"Gnome is already installed."
 else
-	enable-repo extra
 	APP=$"Gnome desktop"
 	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
     ProgressDialog $"Installing $APP"
+    enable-repo extra
 	pkexec dnf install --assumeyes task-gnome
 	ProgressDialog --close
 	if rpm -q task-gnome &>/dev/null; then

diff --git a/usr/share/om-welcome/apps/install-kig.run b/usr/share/om-welcome/apps/install-kig.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which kig &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"Kig is already installed."
+	exec kig
 else
 	APP=$"Kig"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes kig
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-klettres.run b/usr/share/om-welcome/apps/install-klettres.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which klettres &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"KLettres is already installed."
+	exec klettres
 else
 	APP=$"KLettres"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes klettres
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-knavalbattle.run b/usr/share/om-welcome/apps/install-knavalbattle.run
@@ -2,10 +2,11 @@
 . /usr/share/htmlscript/helpers
 
 if which knavalbattle &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"Naval Battle is already installed."
+	exec knavalbattle
 else
 	APP=$"Naval Battle"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes knavalbattle
 	else
@@ -18,3 +19,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-kongress.run b/usr/share/om-welcome/apps/install-kongress.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which kongress &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"Kongress is already installed."
+	exec kongress
 else
 	APP=$"Kongress"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes kongress
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-kpat.run b/usr/share/om-welcome/apps/install-kpat.run
@@ -1,7 +1,7 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which kpat &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"KPatience is already installed."
+	exec kpat
 else
 	APP=$"KPatience"
 	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then

diff --git a/usr/share/om-welcome/apps/install-ktuberling.run b/usr/share/om-welcome/apps/install-ktuberling.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which ktuberling &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"KTuberling is already installed."
+	exec ktuberling
 else
 	APP=$"KTuberling"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes ktuberling
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-kturtle.run b/usr/share/om-welcome/apps/install-kturtle.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which kturtle &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"KTurtle is already installed."
+	exec kturtle
 else
 	APP=$"KTurtle"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes kturtle
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-kubrick.run b/usr/share/om-welcome/apps/install-kubrick.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which kubrick &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"Kubrick is already installed."
+	exec kubrick
 else
 	APP=$"Kubrick"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes kubrick
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-lokalize.run b/usr/share/om-welcome/apps/install-lokalize.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which lokalize &>/dev/null; then
-	kdialog --title $"OpenMandriva"  --msgbox  $" Lokalize is already installed."
+	exec lokalize
 else
 	APP=$"Lokalize"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	pkexec dnf install --assumeyes lokalize
 	ProgressDialog --close
 	if which lokalize &>/dev/null; then
@@ -13,3 +14,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-marble.run b/usr/share/om-welcome/apps/install-marble.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which marble &>/dev/null || which marble-qt &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"Marble is already installed."
+	exec marble
 else
 	APP=$"Marble"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes marble
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-marknote.run b/usr/share/om-welcome/apps/install-marknote.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which marknote; then
-	kdialog --title $"OpenMandriva" --msgbox $" Marknote is already installed.";
+	exec marknote
 else
 	APP=$"Marknote"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	pkexec dnf install --assumeyes marknote
 	ProgressDialog --close
 	if which marknote; then
@@ -13,3 +14,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-mauishell.run b/usr/share/om-welcome/apps/install-mauishell.run
@@ -4,10 +4,10 @@
 if rpm -q maui-shell &>/dev/null; then
 	kdialog --title $"OpenMandriva" --msgbox $"MauiShell is already installed."
 else
-	enable-repo extra
 	APP=$"MauiShell"
 	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
     ProgressDialog $"Installing $APP"
+    enable-repo extra
 	pkexec dnf install --assumeyes maui-shell
 	ProgressDialog --close
 	if rpm -q maui-shell &>/dev/null; then

diff --git a/usr/share/om-welcome/apps/install-merkuro.run b/usr/share/om-welcome/apps/install-merkuro.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which merkuro-calendar &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"Merkuro is already installed."
+	exec merkuro-calendar
 else
 	APP=$"Merkuro"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes merkuro
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-minuet.run b/usr/share/om-welcome/apps/install-minuet.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which minuet &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"Minuet is already installed."
+	exec minuet
 else
 	APP=$"Minuet"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	if [ "0$KDE_SESSION_VERSION" -lt 6 ]; then
 		pkexec dnf install --assumeyes minuet
 	else
@@ -17,3 +18,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-musescore.run b/usr/share/om-welcome/apps/install-musescore.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which musescore &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"MuseScore is already installed."
+	exec musescore
 else
 	APP=$"MuseScore"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	pkexec dnf install --assumeyes musescore
 	ProgressDialog --close
 	if which musescore &>/dev/null; then
@@ -13,3 +14,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-nheko.run b/usr/share/om-welcome/apps/install-nheko.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which nheko &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"nheko is already installed."
+	exec nheko
 else
 	APP=$"Nheko"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	pkexec dnf install --assumeyes nheko
 	ProgressDialog --close
 	if which nheko &>/dev/null; then
@@ -13,3 +14,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-nulloy.run b/usr/share/om-welcome/apps/install-nulloy.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which nulloy &>/dev/null; then
-	kdialog --title $"OpenMandriva" --msgbox $"nulloy is already installed."
+	exec nulloy
 else
 	APP=$"Nulloy"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	pkexec dnf install --assumeyes nulloy
 	ProgressDialog --close
 	if which nulloy &>/dev/null; then
@@ -13,3 +14,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi
diff --git a/usr/share/om-welcome/apps/install-openshot.run b/usr/share/om-welcome/apps/install-openshot.run
@@ -1,10 +1,11 @@
 #!/bin/bash
 . /usr/share/htmlscript/helpers
 if which openshot-qt; then
-	kdialog --title $"OpenMandriva"  --msgbox  $" OpenShot is already installed."
+	exec openshot-qt
 else
 	APP=$"OpenShot"
-	ProgressDialog $"Installing $APP"
+	if kdialog --title $"OpenMandriva" --yesno $"Do you want to install $APP?"; then
+    ProgressDialog $"Installing $APP"
 	enable-repo extra
 	pkexec dnf install --assumeyes openshot
 	ProgressDialog --close
@@ -14,3 +15,4 @@ else
 		kdialog --title $"OpenMandriva" --msgbox $"Installation failed."
 	fi
 fi
+fi