Skip to content

Commit

Permalink
Do not replace EGG_PATCH, instead show EGG_GIT in .status all
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelortmann committed Jan 7, 2025
1 parent 4e5db35 commit 00040bc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1118,9 +1118,9 @@ AC_DEFUN([EGG_SUBST_EGGVERSION],
AC_CHECK_PROG(GIT, git, git)
if test "x$GIT" = xgit; then
egg_patch=$(git rev-parse --short --verify HEAD 2>/dev/null)
if test "$egg_patch" != ""; then
AC_DEFINE_UNQUOTED(EGG_PATCH, "$egg_patch", [Defines the current Eggdrop git commit.])
egg_git=$(git rev-parse --verify HEAD 2>/dev/null)
if test "$egg_git" != ""; then
AC_DEFINE_UNQUOTED(EGG_GIT, "$egg_git", [Defines the current Eggdrop git commit.])
fi
fi
])
Expand Down
3 changes: 3 additions & 0 deletions src/chanprog.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ void tell_settings(int idx)
int i;
struct flag_record fr = { FR_GLOBAL, 0, 0, 0, 0, 0 };

#ifdef EGG_GIT
dprintf(idx, "Git commit: " EGG_GIT "\n");
#endif
dprintf(idx, "Botnet nickname: %s\n", botnetnick);
if (firewall[0])
dprintf(idx, "Firewall: %s:%d\n", firewall, firewallport);
Expand Down
4 changes: 1 addition & 3 deletions src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,4 @@

#define EGG_STRINGVER "1.10.0"
#define EGG_NUMVER 1100005
#ifndef EGG_PATCH
#define EGG_PATCH "pythonfixes"
#endif
#define EGG_PATCH "pythonfixes"

0 comments on commit 00040bc

Please sign in to comment.