Skip to content

Commit

Permalink
Increse Version Name to 50chars
Browse files Browse the repository at this point in the history
  • Loading branch information
mfonville committed Jul 24, 2018
1 parent 0cd9710 commit 966ef82
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions report_sources.sh
Expand Up @@ -89,7 +89,7 @@ if [ -z "$hash" ] && [ -z "$nohelp" ]; then
* nosig: Skips signature checking (which takes a lot of CPU power); NB: this does change the hash result!
* nostub: If you add nostub as an extra argument, the result will not include the apps that are marked as stub (=ending on .stub)
* Example command: './report_sources.sh arm-22 hash'
--------------------------------------------------------------------------------------------------------------------------"
---------------------------------------------------------------------------------------------------------------------------------------------------------------"
fi

case "$buildarch" in
Expand All @@ -98,8 +98,8 @@ case "$buildarch" in
*) fallbackarchs="";;
esac

result="$(printf "%61s|%6s|%3s|%15s|%35s|%10s|%3s|%4s" "Application Name" "Arch." "SDK" "DPI" "Version Name" "Version" "MiB" "Sig.")
------------------------------------------------------------------------------------------------------------------------------------------------"
result="$(printf "%61s|%6s|%3s|%15s|%50s|%10s|%3s|%4s" "Application Name" "Arch." "SDK" "DPI" "Version Name" "Version" "MiB" "Sig.")
---------------------------------------------------------------------------------------------------------------------------------------------------------------"
searchstring="find '$SOURCES/' -iname '*.apk' $nobeta $noleanback | awk -F '/' '{print \$(NF-3)}' | sort | uniq"
allapps="$(eval "$searchstring")"
for appname in $allapps; do
Expand Down Expand Up @@ -135,7 +135,7 @@ for appname in $allapps; do
signed="skip"
fi
result="$result
$(printf "%61s|%6s|%3s|%15s|%35s|%10s|%3s|%4s" "$appname" "$arch" "$sdk" "$dpi" "$versionname" "$versioncode" "$apksize" "$signed")"
$(printf "%61s|%6s|%3s|%15s|%50s|%10s|%3s|%4s" "$appname" "$arch" "$sdk" "$dpi" "$versionname" "$versioncode" "$apksize" "$signed")"
fi
done
if [ -n "$buildarch" ]; then
Expand Down
6 changes: 3 additions & 3 deletions scripts/inc.buildhelper.sh
Expand Up @@ -21,7 +21,7 @@ preparebuildarea() {
if [ -n "$VERSIONLOG" ]; then
logfile="$(eval "echo \"$VERSIONLOG\"")"
install -d "$(dirname "$logfile")"
printf "%-6s%3s| %-61s| %-35s| %s\n--------------------------------------------------------------------------------------------------------------------\n" "Arch." "API" "Application / File / Folder" "Version Name" "DPIs" > "$logfile"
printf "%-6s%3s| %-61s| %-50s| %s\n-----------------------------------------------------------------------------------------------------------------------------------\n" "Arch." "API" "Application / File / Folder" "Version Name" "DPIs" > "$logfile"
fi
}

Expand Down Expand Up @@ -187,9 +187,9 @@ buildapp() {
if [ -z "$baseversionname" ]; then
baseversionname=$versionname
buildlib "$dpivariant" "$liblocation" "$usearch" #Use the libs from this baseversion
printf "%6s-%-2s %-61s %35s" "$usearch" "$api" "$1" "$baseversionname" # use $1 instead of $package to show the foldername packagename instead of the getapkproperties-name to get the setupwizard name right
printf "%6s-%-2s %-61s %50s" "$usearch" "$api" "$1" "$baseversionname" # use $1 instead of $package to show the foldername packagename instead of the getapkproperties-name to get the setupwizard name right
if [ -n "$logfile" ]; then
printf "%6s-%-2s| %-61s| %-35s|" "$usearch" "$api" "$1" "$baseversionname" >> "$logfile"
printf "%6s-%-2s| %-61s| %-50s|" "$usearch" "$api" "$1" "$baseversionname" >> "$logfile"
fi
fi
if [ "$versionname" = "$baseversionname" ]; then
Expand Down

0 comments on commit 966ef82

Please sign in to comment.