Skip to content

Commit

Permalink
see error 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@FEDERICOMB96
FEDERICOMB96 committed Jul 23, 2024
1 parent 06e5339 commit 3b65706
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 41 deletions.
40 changes: 20 additions & 20 deletions version/appversion.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,26 +100,26 @@ update_appversion()
hours=$(date +%H:%M:%S)
month=$(LANG=en_us_88591; date +"%b")

APPVERSION_CONTENT=$(echo -e "\r")
APPVERSION_CONTENT+=$(echo -e "//\r")
APPVERSION_CONTENT+=$(echo -e "// This file is generated automatically.\r")
APPVERSION_CONTENT+=$(echo -e "// Don't edit it.\r")
APPVERSION_CONTENT+=$(echo -e "//\r")
APPVERSION_CONTENT+=$(echo -e "\r")
APPVERSION_CONTENT+=$(echo -e "// MultiMod Manager version\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION $NEW_VERSION_INC\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MAJOR $MAJOR\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MINOR $MINOR\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MAINTENANCE $MAINTENANCE\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_COMMIT $COMMIT_COUNT\r")
APPVERSION_CONTENT+=$(echo -e '#define MM_VERSION_STRD "'$NEW_VERSION'"\r')
APPVERSION_CONTENT+=$(echo -e "\r")
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_DATE "'$month $day $year'"\r')
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_TIME "'$hours'"\r')
APPVERSION_CONTENT+=$(echo -e "\r")
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_SHA "'$COMMIT_SHA'"\r')
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_URL "'$COMMIT_URL'"\r')
APPVERSION_CONTENT+=$(echo -e "\r")
APPVERSION_CONTENT=$(echo -e "")
APPVERSION_CONTENT+=$(echo -e "//")
APPVERSION_CONTENT+=$(echo -e "// This file is generated automatically.")
APPVERSION_CONTENT+=$(echo -e "// Don't edit it.")
APPVERSION_CONTENT+=$(echo -e "//")
APPVERSION_CONTENT+=$(echo -e "")
APPVERSION_CONTENT+=$(echo -e "// MultiMod Manager version")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION $NEW_VERSION_INC")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MAJOR $MAJOR")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MINOR $MINOR")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MAINTENANCE $MAINTENANCE")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_COMMIT $COMMIT_COUNT")
APPVERSION_CONTENT+=$(echo -e '#define MM_VERSION_STRD "'$NEW_VERSION'"')
APPVERSION_CONTENT+=$(echo -e "")
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_DATE "'$month $day $year'"')
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_TIME "'$hours'"')
APPVERSION_CONTENT+=$(echo -e "")
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_SHA "'$COMMIT_SHA'"')
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_URL "'$COMMIT_URL'"')
APPVERSION_CONTENT+=$(echo -e "")

echo Updating $APPVERSION_FILE, new version is '"'$NEW_VERSION'"'

Expand Down
46 changes: 25 additions & 21 deletions version/appversion_pr.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,27 +101,27 @@ update_appversion()
hours=$(date +%H:%M:%S)
month=$(LANG=en_us_88591; date +"%b")

APPVERSION_CONTENT=$(echo -e "\r")
APPVERSION_CONTENT+=$(echo -e "//\r")
APPVERSION_CONTENT+=$(echo -e "// This file is generated automatically.\r")
APPVERSION_CONTENT+=$(echo -e "// Don't edit it.\r")
APPVERSION_CONTENT+=$(echo -e "//\r")
APPVERSION_CONTENT+=$(echo -e "\r")
APPVERSION_CONTENT+=$(echo -e "// MultiMod Manager version\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION $NEW_VERSION_INC\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MAJOR $MAJOR\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MINOR $MINOR\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MAINTENANCE $MAINTENANCE\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_COMMIT $COMMIT_COUNT\r")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_PR_ID $PULL_REQUEST_ID\r")
APPVERSION_CONTENT+=$(echo -e '#define MM_VERSION_STRD "'$NEW_VERSION'"\r')
APPVERSION_CONTENT+=$(echo -e "\r")
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_DATE "'$month $day $year'"\r')
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_TIME "'$hours'"\r')
APPVERSION_CONTENT+=$(echo -e "\r")
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_SHA "'$COMMIT_SHA'"\r')
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_URL "'$COMMIT_URL'"\r')
APPVERSION_CONTENT+=$(echo -e "\r")
APPVERSION_CONTENT=$(echo -e "")
APPVERSION_CONTENT+=$(echo -e "//")
APPVERSION_CONTENT+=$(echo -e "// This file is generated automatically.")
APPVERSION_CONTENT+=$(echo -e "// Don't edit it.")
APPVERSION_CONTENT+=$(echo -e "//")
APPVERSION_CONTENT+=$(echo -e "")
APPVERSION_CONTENT+=$(echo -e "// MultiMod Manager version")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION $NEW_VERSION_INC")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MAJOR $MAJOR")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MINOR $MINOR")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_MAINTENANCE $MAINTENANCE")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_COMMIT $COMMIT_COUNT")
APPVERSION_CONTENT+=$(echo -e "#define MM_VERSION_PR_ID $PULL_REQUEST_ID")
APPVERSION_CONTENT+=$(echo -e '#define MM_VERSION_STRD "'$NEW_VERSION'"')
APPVERSION_CONTENT+=$(echo -e "")
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_DATE "'$month $day $year'"')
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_TIME "'$hours'"')
APPVERSION_CONTENT+=$(echo -e "")
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_SHA "'$COMMIT_SHA'"')
APPVERSION_CONTENT+=$(echo -e '#define MM_COMMIT_URL "'$COMMIT_URL'"')
APPVERSION_CONTENT+=$(echo -e "")

echo Updating $APPVERSION_FILE, new version is '"'$NEW_VERSION'"'

Expand All @@ -132,6 +132,8 @@ update_appversion()
echo -e $APPVERSION_CONTENT>>$APPVERSION_FILE
echo -e '#define PLUGIN_VERSION "'$NEW_VERSION'"\r'>>$APPVERSION_FILE

cat $APPVERSION_FILE

echo Updating $APPVERSION_FILE_NATIVES, new version is '"'$NEW_VERSION'"'

echo -e "#if defined _multimod_manager_version_included_\r">$APPVERSION_FILE_NATIVES
Expand All @@ -140,6 +142,8 @@ update_appversion()
echo -e "#define _multimod_manager_version_included_\r">>$APPVERSION_FILE_NATIVES
echo -e $APPVERSION_CONTENT>>$APPVERSION_FILE_NATIVES
echo -e '#define MM_NATIVES_API_VER "'$NEW_VERSION'"\r'>>$APPVERSION_FILE_NATIVES

cat $APPVERSION_FILE_NATIVES
}

# Initialise
Expand Down

0 comments on commit 3b65706

Please sign in to comment.