Skip to content

Commit ff1b304

Browse files
committed
NewVersion: fix/improve updating compile_version
The previous method did not work as expected. Now it should work fine.
1 parent 9909487 commit ff1b304

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

bin/NewVersion

+13-7
Original file line numberDiff line numberDiff line change
@@ -102,25 +102,31 @@ cd "$newrecipedir" || Die "Failed creating new recipe dir."
102102

103103
[ -e "Recipe" ] || Die "Recipe file not found."
104104

105-
# strip compile_version
106-
sed -i '/^compile_version=/d' Recipe
107-
108105
# Use -a to avoid considering the file as binary if there are multibyte characters
109106
grep -av '# Recipe for version' Recipe > Recipe.old
110107

111108
if [ "$compileRecipeAuthor" != "" ]
112109
then
113110
echo "# Recipe for version $newversion by $compileRecipeAuthor, on" `date` > Recipe
114-
# Add compile_version here since it is supposed to be at the top.
115-
# Note: For a future version it might make sense to "sort" the resulting Recipe as the last step.
116-
# This way we could add/edit values in-place without worrying about order and get consistend results.
117-
echo "compile_version=$scriptVersion" >> Recipe
118111
cat Recipe.old >> Recipe
119112
else
120113
Log_Terse "Please fill in the 'compileRecipeAuthor' variable in $goboSettings/Compile/Compile.conf"
121114
mv Recipe.old Recipe
122115
fi
123116

117+
# update compile_version
118+
sed -i '/^compile_version=/d' Recipe
119+
grep -a '# Recipe for version\|# Recipe (MakeRecipe)' Recipe > Recipe.new
120+
grep -av '# Recipe for version\|# Recipe (MakeRecipe)' Recipe > Recipe.old
121+
echo "compile_version=$scriptVersion" >> Recipe.new
122+
cat Recipe.old >> Recipe.new
123+
mv Recipe.new Recipe
124+
125+
# update compile_version
126+
#sed -i "s|^compile_version=.*|compile_version=$scriptVersion|" Recipe
127+
# Note: For a future version it might make sense to "sort" the resulting Recipe as the last step.
128+
# This way we could add/edit values in-place without worrying about order and get consistend results.
129+
124130
if [ "$newurl" ]
125131
then
126132
# TODO: generalize mirror system

0 commit comments

Comments
 (0)