psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

pkggen to git

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2009-03-02 21:28:36 +01:00
parent beeea117bf
commit 8b8cd94ec0
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
utility/pkggen.c
View file

@ -13,7 +13,7 @@
#define unless(x) if (!(x))
void cvscp(char *filename) {
void vcscp(char *filename) {
char cmdline[1000];
printf(">>> %s\n", filename);
@ -115,12 +115,18 @@ int main(int argc, char **argv) {
hmm, doesn't really work like that
*/
puts(">> Now is your chance to inspect a cvs diff. Suspend now.");
puts(">> Doing a git fetch");
if (system("git fetch origin")) {
puts(">> Error during git fetch. Exiting.");
return 1;
}
puts(">> Now is your chance to inspect a 'git diff master..origin/master'. Suspend now.");
sleep(4);
puts(">> Doing a CVS update");
if (system("cvs -q update -dP")) {
puts(">> Error during CVS update. Exiting.");
puts(">> Doing a git merge");
if (system("git merge -s resolve origin")) {
puts(">> Error during git merge. Exiting.");
return 1;
}
@ -138,9 +144,9 @@ int main(int argc, char **argv) {
return 1;
}
puts(">> Updating files from CVS");
puts(">> Updating files from version control system");
cvscp("install.sh");
vcscp("install.sh");
puts(">> Cleaning up data/");
chdir("..");