ubuntu-sdk-team team mailing list archive

[Christian Dywan <christian@xxxxxxxxxxxx>]

Christian Dywan has proposed merging lp:~kalikiana/ubuntu-sdk-ide/usrbin into lp:ubuntu-sdk-ide.

Commit message:
Remove hard-coded /usr/bin/ prefix from ubuntuconstants

Requested reviews:
  ubuntu-sdk-build-bot (ubuntu-sdk-build-bot): continuous-integration
  Ubuntu SDK team (ubuntu-sdk-team)
Related bugs:
  Bug #1647484 in Ubuntu SDK IDE: "Hard-coded paths to pkexec and other tools"
  https://bugs.launchpad.net/ubuntu-sdk-ide/+bug/1647484

For more details, see:
https://code.launchpad.net/~kalikiana/ubuntu-sdk-ide/usrbin/+merge/312509
-- 
Your team Ubuntu SDK team is requested to review the proposed merge of lp:~kalikiana/ubuntu-sdk-ide/usrbin into lp:ubuntu-sdk-ide.

=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h	2016-11-07 10:48:52 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h	2016-12-05 21:38:01 +0000
@@ -117,8 +117,8 @@
 const char UBUNTUPROJECT_REMOTE_RUNCONTROL_SCOPE_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.Scope";
 const char UBUNTUPROJECT_REMOTE_RUNCONTROL_APP_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.App";
 
-const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "/usr/bin/ubuntu-html5-app-launcher";
-const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "/usr/bin/webapp-container";
+const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "ubuntu-html5-app-launcher";
+const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "webapp-container";
 const char UBUNTUSCOPES_PROJECT_LAUNCHER_EXE[] = "qtc_desktop_scoperunner.py";
 
 const char UBUNTUBZR_INITIALIZE[] ="%0/qtc_bzr_info";
@@ -280,9 +280,9 @@
 const char  UBUNTU_SETTINGS_ICON[] = ":/ubuntu/images/ubuntu-32.png";
 
 //review tools
-const char CLICK_REVIEWERSTOOLS_BINARY[]   = "/usr/bin/click-review";
+const char CLICK_REVIEWERSTOOLS_BINARY[]   = "click-review";
 const char CLICK_REVIEWERSTOOLS_ARGS[]     = "--sdk \"%0\"";
-const char CLICK_REVIEWERSTOOLS_LOCATION[] = "/usr/bin/click-review --sdk \"%0\"";
+const char CLICK_REVIEWERSTOOLS_LOCATION[] = "click-review --sdk \"%0\"";
 
 //build configuration
 const char UBUNTU_CLICK_OPEN_TERMINAL_ERROR[] = "Error when starting terminal";
@@ -294,8 +294,8 @@
 
 const char UBUNTU_CLICK_CHROOT_SUFFIX_ENV_VAR[] = "CLICK_CHROOT_SUFFIX";
 const char UBUNTU_CLICK_CHROOT_DEFAULT_NAME[] = "click"; 
-const char UBUNTU_CLICK_BINARY[]  = "/usr/bin/click";
-const char UBUNTU_SUDO_BINARY[]   = "/usr/bin/pkexec";
+const char UBUNTU_CLICK_BINARY[]  = "click";
+const char UBUNTU_SUDO_BINARY[]   = "pkexec";
 
 const QString UBUNTU_TARGET_TOOL = QStandardPaths::findExecutable(QStringLiteral("usdk-target"));
 const char UBUNTU_CREATE_CLICK_TARGET_ARGS[]  = "env USDK_TEST_REMOTE=\"%0\" %1 create -n %2 -p %3";