Skip to content
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

Jump to bottom

Guess updateinformation for GitHub Actions #13

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Guess updateinformation for GitHub Actions #13

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d5456a4
Guess updateinformation for GitHub Actions
probonopd Jun 26, 2023
6755313
Only guess update information for GitHub if environment variables exist
probonopd Jun 27, 2023
59d507b
Implement change suggested by reviewer
probonopd Jul 2, 2023
db26eae
Merge branch 'main' into feature-guess-github
probonopd Jul 2, 2023
57b2c1d
Use snprintf
probonopd Jul 5, 2023
caa7f0d
Use snprintf everywhere
probonopd Jul 5, 2023
d6a5081
Use snprintf only where we use buf
probonopd Jul 5, 2023
e1200c3
Fix compilation
probonopd Jul 5, 2023
32cdd3e
Merge branch 'main' into feature-guess-github
probonopd Jul 5, 2023
92b50b6
Merge branch 'main' into feature-guess-github
probonopd Jul 16, 2023
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
24 changes: 17 additions & 7 deletions src/appimagetool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ main (int argc, char *argv[])
GOptionContext *context;

// initialize help text of argument
sprintf(_exclude_file_desc, "Uses given file as exclude file for mksquashfs, in addition to %s.", APPIMAGEIGNORE);
snprintf(_exclude_file_desc, "Uses given file as exclude file for mksquashfs, in addition to %s.", APPIMAGEIGNORE);
probonopd marked this conversation as resolved.
Show resolved Hide resolved

context = g_option_context_new ("SOURCE [DESTINATION] - Generate AppImages from existing AppDirs");
g_option_context_add_main_entries (context, entries, NULL);
Expand Down Expand Up @@ -750,7 +750,7 @@ main (int argc, char *argv[])
fprintf(stderr, "Using architecture %s\n", arch);

char app_name_for_filename[PATH_MAX];
sprintf(app_name_for_filename, "%s", get_desktop_entry(kf, "Name"));
snprintf(app_name_for_filename, PATH_MAX, "%s", get_desktop_entry(kf, "Name"));
replacestr(app_name_for_filename, " ", "_");

if(verbose)
Expand All @@ -765,9 +765,9 @@ main (int argc, char *argv[])

// if $VERSION is specified, we embed it into the filename
if (version_env != NULL) {
sprintf(dest_path, "%s-%s-%s.AppImage", app_name_for_filename, version_env, arch);
snprintf(dest_path, "%s-%s-%s.AppImage", app_name_for_filename, version_env, arch);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above, size missing.

} else {
sprintf(dest_path, "%s-%s.AppImage", app_name_for_filename, arch);
snprintf(dest_path, "%s-%s.AppImage", app_name_for_filename, arch);
probonopd marked this conversation as resolved.
Show resolved Hide resolved
}

destination = strdup(dest_path);
Expand Down Expand Up @@ -826,7 +826,7 @@ main (int argc, char *argv[])
/* Check if AppStream upstream metadata is present in source AppDir */
if(! no_appstream){
char application_id[PATH_MAX];
sprintf (application_id, "%s", basename(desktop_file));
snprintf (application_id, "%s", basename(desktop_file));
probonopd marked this conversation as resolved.
Show resolved Hide resolved
replacestr(application_id, ".desktop", ".appdata.xml");
gchar *appdata_path = g_build_filename(source, "/usr/share/metainfo/", application_id, NULL);
if (! g_file_test(appdata_path, G_FILE_TEST_IS_REGULAR)){
Expand Down Expand Up @@ -926,7 +926,12 @@ main (int argc, char *argv[])
if(zsyncmake_path){
char buf[1024];
probonopd marked this conversation as resolved.
Show resolved Hide resolved
// gh-releases-zsync|probono|AppImages|latest|Subsurface-*x86_64.AppImage.zsync
sprintf(buf, "gh-releases-zsync|%s|%s|latest|%s*-%s.AppImage.zsync", github_repository_owner, github_repository_name, app_name_for_filename, arch);
int ret = snprintf(buf, "gh-releases-zsync|%s|%s|latest|%s*-%s.AppImage.zsync", github_repository_owner, github_repository_name, app_name_for_filename, arch);
if (ret < 0) {
die("snprintf error");
} else if (ret >= sizeof(buf)) {
die("snprintf buffer overflow");
}
updateinformation = buf;
printf("Guessing update information based on $GITHUB_REPOSITORY=%s\n", github_repository);
printf("%s\n", updateinformation);
Expand Down Expand Up @@ -974,7 +979,12 @@ main (int argc, char *argv[])
gchar *zsyncmake_path = g_find_program_in_path ("zsyncmake");
if(zsyncmake_path){
char buf[1024];
sprintf(buf, "zsync|%s/-/jobs/artifacts/%s/raw/%s-%s.AppImage.zsync?job=%s", CI_PROJECT_URL, CI_COMMIT_REF_NAME, app_name_for_filename, arch, CI_JOB_NAME);
int ret = snprintf(buf, sizeof(buf), "zsync|%s/-/jobs/artifacts/%s/raw/%s-%s.AppImage.zsync?job=%s", CI_PROJECT_URL, CI_COMMIT_REF_NAME, app_name_for_filename, arch, CI_JOB_NAME);
if (ret < 0) {
die("snprintf error");
} else if (ret >= sizeof(buf)) {
die("snprintf buffer overflow");
}
updateinformation = buf;
printf("Guessing update information based on $CI_COMMIT_REF_NAME=%s and $CI_JOB_NAME=%s\n", CI_COMMIT_REF_NAME, CI_JOB_NAME);
printf("%s\n", updateinformation);
Expand Down