Skip to content

Instantly share code, notes, and snippets.

@shmohawk
Created April 19, 2017 07:15
Show Gist options
  • Save shmohawk/35afc73213b1fe53cd7d7af457f9f3ab to your computer and use it in GitHub Desktop.
Save shmohawk/35afc73213b1fe53cd7d7af457f9f3ab to your computer and use it in GitHub Desktop.
diff --git a/src/MainPanel.cpp b/src/MainPanel.cpp
index 3909137..f93de06 100755
--- a/src/MainPanel.cpp
+++ b/src/MainPanel.cpp
@@ -240,7 +240,7 @@ void MainPanel::OnInstall(wxCommandEvent& event)
iso = m_dvdDriveDevList.at(m_dvdDriveList->GetSelection());
}
- PipeManager pipe(std::string("gksudo --description 'WinUSB' -- sh -c 'winusb --noColor --forGui --format \"") + iso + "\" \"" + device + "\" 2>&1'");
+ PipeManager pipe(std::string("pkexec sh -c '/usr/local/bin/winusb --noColor --forGui --format \"") + iso + "\" \"" + device + "\" 2>&1'");
wxProgressDialog *dialog = new wxProgressDialog(_("Installing..."), _("Please wait..."), 100, GetParent(), wxPD_APP_MODAL | wxPD_SMOOTH | wxPD_CAN_ABORT);
diff --git a/src/winusb b/src/winusb
index f4e0ac6..1784dab 100755
--- a/src/winusb
+++ b/src/winusb
@@ -413,7 +413,14 @@ uuid=$(blkid -o value -s UUID "$partition")
# grub.cfg
echo "Installing grub.cfg..."
-cfgFilename="$partitionMountPath/grub/grub.cfg"
+
+if [ -d "$partitionMountPath/grub2" ]
+then
+ cfgFilename="$partitionMountPath/grub2/grub.cfg"
+else
+ cfgFilename="$partitionMountPath/grub/grub.cfg"
+fi
+
mkdir -p "$(dirname "$cfgFilename")"
echo -n "" > "$cfgFilename"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment