diff options
| author | Devid Antonio Floni <d.filoni@ubuntu.com> | 2017-06-18 21:59:28 +0300 |
|---|---|---|
| committer | Devid Antonio Floni <d.filoni@ubuntu.com> | 2017-06-20 21:17:28 +0300 |
| commit | 0384f9d431e5b86597cb2c376ff3c819d1278eab (patch) | |
| tree | 725370e339102657e23d70acc019edf55c16e159 | |
| parent | 304a8944fb1d8caaeec686b6b2d51e7ec70a6b0a (diff) | |
snap: Use SNAP_USER_COMMON/.ssh as ssh files path
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | remmina/src/remmina_file_editor.c | 4 | ||||
| -rw-r--r-- | remmina/src/remmina_ssh.c | 3 | ||||
| -rw-r--r-- | snap/snapcraft.yaml.in | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a3cae1003..3132016a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,6 +160,10 @@ if(SNAP_BUILD_ONLY) return() endif() +if(SNAP_BUILD) + add_definitions(-DSNAP_BUILD) +endif() + # Uninstall support configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" diff --git a/remmina/src/remmina_file_editor.c b/remmina/src/remmina_file_editor.c index f78709ad5..ebab73d20 100644 --- a/remmina/src/remmina_file_editor.c +++ b/remmina/src/remmina_file_editor.c @@ -345,7 +345,11 @@ static void remmina_file_editor_create_ssh_privatekey(RemminaFileEditor* gfe, Gt NULL); widget = gtk_file_chooser_button_new_with_dialog (dialog); +#ifdef SNAP_BUILD + s = g_strdup_printf("%s/.ssh", g_getenv ("SNAP_USER_COMMON")); +#else s = g_strdup_printf("%s/.ssh", g_get_home_dir ()); +#endif if (g_file_test (s, G_FILE_TEST_IS_DIR)) { gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), s); diff --git a/remmina/src/remmina_ssh.c b/remmina/src/remmina_ssh.c index 532944d21..a14919793 100644 --- a/remmina/src/remmina_ssh.c +++ b/remmina/src/remmina_ssh.c @@ -430,6 +430,9 @@ remmina_ssh_init_session (RemminaSSH *ssh) ssh_options_set (ssh->session, SSH_OPTIONS_HOST, ssh->server); ssh_options_set (ssh->session, SSH_OPTIONS_PORT, &ssh->port); ssh_options_set (ssh->session, SSH_OPTIONS_USER, ssh->user); +#ifdef SNAP_BUILD + ssh_options_set (ssh->session, SSH_OPTIONS_SSH_DIR, g_strdup_printf ("%s/.ssh", g_getenv ("SNAP_USER_COMMON"))); +#endif ssh_callbacks_init(ssh->callback); if (remmina_log_running ()) diff --git a/snap/snapcraft.yaml.in b/snap/snapcraft.yaml.in index ce475ef82..f7859a770 100644 --- a/snap/snapcraft.yaml.in +++ b/snap/snapcraft.yaml.in @@ -108,6 +108,7 @@ parts: configflags: - -DCMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@ - -DCMAKE_PREFIX_PATH=$SNAPCRAFT_STAGE/usr + - -DSNAP_BUILD=on # XXX: This is an hack to have a kind of bind-mount with absolute prefix. - -DCMAKE_INSTALL_PREFIX=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr |