Changeset 811f42a

Timestamp:

05/02/2021 08:23:32 AM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/usr-move

Children:

b7dc3d8

Parents:

a68ea9a (diff), 54ee51d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into xry111/usr-move

Files:

• chapter07/createfiles.xml (modified) (1 diff)
• git-version.sh (modified) (2 diffs)

chapter07/createfiles.xml

@@ -48 +48 @@
   as well:</para>
 
-<screen><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
+<screen><userinput>cat &gt; /etc/hosts &lt;&lt; EOF
+"127.0.0.1 localhost $(hostname)" 
+::1        localhost
+EOF</userinput></screen>
 
   <para>In order for user <systemitem class="username">root</systemitem> to be

git-version.sh

@@ -15 +15 @@
 
 commit_date=$(git show -s --format=format:"%cd" --date=local)
-short_date=$(date --date "$commit_date" "+%Y%m%d")
 
 year=$(date --date "$commit_date" "+%Y")
@@ -31 +30 @@
 full_date="$month $day$suffix, $year"
 
-sha="g$(git describe --always)"
-version="GIT-$short_date-$sha"
-versiond="GIT-$short_date-$sha-systemd"
+sha="$(git describe --abbrev=1)"
+if [ "$(git branch --show-current)" = "trunk" ]; then
+        sha=$(echo "$sha" | sed 's/-g[^-]*$//')
+fi
+version="$sha"
+versiond="$sha-systemd"
 
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then
-        version="$version-MODIFIED"
-        versiond="$versiond-MODIFIED"
+        version="$version+"
+        versiond="$versiond+"
 fi