Add VERSION in the tarball

Update LICENSE
States need EOL
2016-01-01 12:32:20 +01:00 · 2016-01-01 11:47:17 +01:00 · 2016-01-01 11:00:29 +01:00
4 changed files with 15 additions and 12 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2015, angt
+Copyright (c) 2015-2016, angt
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,8 @@ glorytun_SOURCES = \
    src/db.h

 EXTRA_DIST = \
-	LICENSE \
-	README.md \
-	autogen.sh \
-	version.sh
+    LICENSE \
+    README.md \
+    VERSION \
+    autogen.sh \
+    version.sh
--- a/src/main.c
+++ b/src/main.c
@@ -928,7 +928,7 @@ int main (int argc, char **argv)

    long retry = 0;

-    fd_write_str(state_fd, "INITIALIZED");
+    fd_write_str(state_fd, "INITIALIZED\n");

    while (!gt_close) {
        if (retry_count>=0 && retry>=retry_count+1) {
@@ -995,7 +995,7 @@ int main (int argc, char **argv)

        retry = 0;

-        fd_write_str(state_fd, "STARTED");
+        fd_write_str(state_fd, "STARTED\n");

        fd_set rfds;
        FD_ZERO(&rfds);
@@ -1180,7 +1180,7 @@ int main (int argc, char **argv)
            sock.fd = -1;
        }

-        fd_write_str(state_fd, "STOPPED");
+        fd_write_str(state_fd, "STOPPED\n");
    }

    freeaddrinfo(ai);
--- a/version.sh
+++ b/version.sh
@@ -3,9 +3,11 @@
 [ -z "${VERSION}" ] && VERSION=`git describe --tags --always 2>/dev/null` \
                    && VERSION=${VERSION#v}

-[ -z "${VERSION}" ] && VERSION=`basename \`pwd\`` \
-                    && VERSION=${VERSION#*-}
+[ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null`

-[ "$1" = "major"  ] && VERSION=${VERSION%%.*}
+[ -z "${VERSION}" ] && VERSION=0.0.0

-printf ${VERSION}
+[ "$1" = "major"  ] && printf ${VERSION%%.*} \
+                    && exit 0
+
+printf ${VERSION} | tee VERSION
Author	SHA1	Message	Date
angt	8fa2322314	Add VERSION in the tarball	2016-01-01 12:32:20 +01:00
angt	8982f27220	Update LICENSE	2016-01-01 11:47:17 +01:00
angt	a5f97fcc8c	States need EOL	2016-01-01 11:00:29 +01:00