mirror of
https://github.com/iDescriptor/iDescriptor.git
synced 2026-06-22 03:45:51 +08:00
bundle iproxy with the application and update initialization logic in SSHTerminalWidget
This commit is contained in:
@@ -283,12 +283,15 @@ void SSHTerminalWidget::initWiredDevice()
|
||||
qDebug() << "Starting iproxy with args:" << args;
|
||||
|
||||
QString iproxyPath;
|
||||
QString appDirPath = QCoreApplication::applicationDirPath();
|
||||
QString bundledIproxyPath = appDirPath + "/iproxy";
|
||||
|
||||
/*
|
||||
Check if running in AppImage
|
||||
this is set by the plugin script
|
||||
*/
|
||||
if (qEnvironmentVariableIsSet("IPROXY_BIN_APPIMAGE")) {
|
||||
/* MacOS bundled iproxy */
|
||||
if (QFileInfo(bundledIproxyPath).isExecutable()) {
|
||||
iproxyPath = bundledIproxyPath;
|
||||
}
|
||||
/* AppImage - this is set by the plugin script */
|
||||
else if (qEnvironmentVariableIsSet("IPROXY_BIN_APPIMAGE")) {
|
||||
iproxyPath = qgetenv("IPROXY_BIN_APPIMAGE");
|
||||
if (iproxyPath.isEmpty()) {
|
||||
showError("Error: Running in AppImage mode, but "
|
||||
|
||||
Reference in New Issue
Block a user