Skip to content

Enable portable home/config dirs for extract-and-run #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheAssassin merged 9 commits into from
Dec 8, 2024
Merged

Enable portable home/config dirs for extract-and-run #5

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cd1cb70
Enable portable home/config dirs for extract-and-run
xordspar0 Feb 25, 2023
7e723a8
Make the build work with Alpine 3.17
xordspar0 Feb 25, 2023
7852177
Merge branch 'main' into home-and-config-for-extracted
probonopd Jun 25, 2023
78fe4b5
Merge branch 'main' into home-and-config-for-extracted
probonopd Jul 1, 2023
e63ff52
Merge branch 'main' into home-and-config-for-extracted
probonopd Jul 4, 2023
cb39397
Merge branch 'main' into home-and-config-for-extracted
xordspar0 Dec 29, 2023
b2730f0
Merge branch 'main' into home-and-config-for-extracted
xordspar0 Oct 31, 2024
cb0ce51
Merge branch 'main' into home-and-config-for-extracted
probonopd Nov 28, 2024
31c4931
Merge branch 'main' into home-and-config-for-extracted
probonopd Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions src/runtime/runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,27 @@ char* appimage_hexlify(const char* bytes, const size_t numBytes) {
return hexlified;
}

void set_portable_home_and_config(char* basepath) {
char portable_home_dir[PATH_MAX];
char portable_config_dir[PATH_MAX];

/* If there is a directory with the same name as the AppImage plus ".home", then export $HOME */
strcpy(portable_home_dir, basepath);
strcat(portable_home_dir, ".home");
if (is_writable_directory(portable_home_dir)) {
fprintf(stderr, "Setting $HOME to %s\n", portable_home_dir);
setenv("HOME", portable_home_dir, 1);
}

/* If there is a directory with the same name as the AppImage plus ".config", then export $XDG_CONFIG_HOME */
strcpy(portable_config_dir, basepath);
strcat(portable_config_dir, ".config");
if (is_writable_directory(portable_config_dir)) {
fprintf(stderr, "Setting $XDG_CONFIG_HOME to %s\n", portable_config_dir);
setenv("XDG_CONFIG_HOME", portable_config_dir, 1);
}
}

int main(int argc, char* argv[]) {
const bool verbose = (getenv("VERBOSE") != NULL);
if (verbose) {
Expand Down Expand Up @@ -1614,6 +1635,8 @@ int main(int argc, char* argv[]) {
setenv("ARGV0", argv0_path, 1);
setenv("APPDIR", prefix, 1);

set_portable_home_and_config(fullpath);

execv(apprun_path, new_argv);

int error = errno;
Expand Down Expand Up @@ -1803,24 +1826,7 @@ int main(int argc, char* argv[]) {
setenv("ARGV0", argv0_path, 1);
setenv("APPDIR", mount_dir, 1);

char portable_home_dir[PATH_MAX];
char portable_config_dir[PATH_MAX];

/* If there is a directory with the same name as the AppImage plus ".home", then export $HOME */
strcpy(portable_home_dir, fullpath);
strcat(portable_home_dir, ".home");
if (is_writable_directory(portable_home_dir)) {
fprintf(stderr, "Setting $HOME to %s\n", portable_home_dir);
setenv("HOME", portable_home_dir, 1);
}

/* If there is a directory with the same name as the AppImage plus ".config", then export $XDG_CONFIG_HOME */
strcpy(portable_config_dir, fullpath);
strcat(portable_config_dir, ".config");
if (is_writable_directory(portable_config_dir)) {
fprintf(stderr, "Setting $XDG_CONFIG_HOME to %s\n", portable_config_dir);
setenv("XDG_CONFIG_HOME", portable_config_dir, 1);
}
set_portable_home_and_config(fullpath);

/* Original working directory */
char cwd[1024];
Expand Down
Loading