ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-02 07:06:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

New pill URL format and search through old commits

Browse Source
This commit is contained in:
Ted Blackman 2017-12-05 17:59:20 -08:00
parent fd7dde786f
commit 677a97371b
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
noun/manage.c
View File

@ -1500,10 +1500,10 @@ u3m_init(c3_o chk_o)
/* _get_cmd_output(): Run a shell command and capture its output. /* _get_cmd_output(): Run a shell command and capture its output.
Exits with an error if the command fails or produces no output. Exits with an error if the command fails or produces no output.
The 'out_c' parameter should be an array of sufficient length to hold The 'out_c' parameter should be an array of sufficient length to hold
the command's output, up to a max of 2048 characters. the command's output, up to a max of len_c characters.
*/ */
static void static void
_get_cmd_output(c3_c *cmd_c, c3_c *out_c) _get_cmd_output(c3_c *cmd_c, c3_c *out_c, c3_w len_c)
{ {
FILE *fp = popen(cmd_c, "r"); FILE *fp = popen(cmd_c, "r");
if ( NULL == fp ) { if ( NULL == fp ) {
@ -1511,7 +1511,7 @@ _get_cmd_output(c3_c *cmd_c, c3_c *out_c)
exit(1); exit(1);
} }
if ( NULL == fgets(out_c, 2048, fp) ) { if ( NULL == fgets(out_c, len_c, fp) ) {
fprintf(stderr, "'%s' produced no output\n", cmd_c); fprintf(stderr, "'%s' produced no output\n", cmd_c);
exit(1); exit(1);
} }
@ -1519,30 +1519,19 @@ _get_cmd_output(c3_c *cmd_c, c3_c *out_c)
pclose(fp); pclose(fp);
} }
/* _arvo_hash(): retrieve git hash of arvo directory. /* _arvo_hash(): get a shortened hash of the last git commit
hax_c must be an array with length >= 41. that modified the sys/ directory in arvo.
hax_c must be an array with length >= 11.
*/ */
static void static void
_arvo_hash(c3_c *out_c, c3_c *arv_c) _arvo_hash(c3_c *out_c, c3_c *arv_c)
{ {
c3_c cmd_c[2048]; c3_c cmd_c[2048];
sprintf(cmd_c, "git -C %s rev-parse HEAD", arv_c); sprintf(cmd_c, "git -C %s log -1 HEAD --format=%H -- sys/", arv_c);
_get_cmd_output(cmd_c, out_c); _get_cmd_output(cmd_c, out_c, 11);
out_c[strcspn(out_c, "\r\n")] = 0; /* strip newline */ out_c[10] = 0; // end with null-byte
}
/* _git_branch(): retrieve the current git branch */
static void
_git_branch(c3_c *out_c, c3_c *arv_c)
{
c3_c cmd_c[2048];
sprintf(cmd_c, "git -C %s rev-parse --abbrev-ref HEAD", arv_c);
_get_cmd_output(cmd_c, out_c);
out_c[strcspn(out_c, "\r\n")] = 0; /* strip newline */
} }
/* _git_pill_url(): produce a URL from which to download a pill /* _git_pill_url(): produce a URL from which to download a pill
@ -1551,6 +1540,8 @@ _git_branch(c3_c *out_c, c3_c *arv_c)
static void static void
_git_pill_url(c3_c *out_c, c3_c *arv_c) _git_pill_url(c3_c *out_c, c3_c *arv_c)
{ {
c3_c hax_c[11];
assert(NULL != arv_c); assert(NULL != arv_c);
if ( 0 != system("which git >> /dev/null") ) { if ( 0 != system("which git >> /dev/null") ) {
@ -1558,15 +1549,8 @@ _git_pill_url(c3_c *out_c, c3_c *arv_c)
exit(1); exit(1);
} }
{
c3_c hax_c[2048];
c3_c bra_c[2048];
_git_branch(bra_c, arv_c);
_arvo_hash(hax_c, arv_c); _arvo_hash(hax_c, arv_c);
sprintf(out_c, "https://bootstrap.urbit.org/git-%s.pill", hax_c);
sprintf(out_c, "https://bootstrap.urbit.org/%s-%s.pill", hax_c, bra_c);
}
} }
/* _boot_home(): create ship directory. */ /* _boot_home(): create ship directory. */