Skip to content

Commit

Permalink
Merge branch 'master' of github.com:gobolinux/Compile
Browse files Browse the repository at this point in the history
  • Loading branch information
hishamhm committed Jan 11, 2017
2 parents 5e1e001 + 00a2476 commit c363de4
Showing 1 changed file with 29 additions and 1 deletion.
30 changes: 29 additions & 1 deletion bin/Compile
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,36 @@ function wrapup() {
# Add information inside binary package Resources directory
Quiet mkdir -p $target/Resources

# Respawning with Runner has its oddities. We need to evaluate the recipe
# again to get the $url info needed to write the PackageSource meta-data.
source_recipe

# Save use flags information
echo "${useflags[*]}" | $sudo_exec tee "$target/Resources/UseFlags" >/dev/null || wrap_fail "Failed installing file."
echo "$(Get_Architecture)" | $sudo_exec tee "$target/Resources/Architecture" >/dev/null || wrap_fail "Failed installing file."

# Save PackageSource
local distro="GoboLinux $(cat $goboSettings/GoboLinuxVersion)"
local archinfo="$(uname -a)"
local fileinfo=
if [ "${urls[*]}" ]
then fileinfo=$(printf "[File] %s\n" "${urls[@]}")
elif [ "$url" ]
then fileinfo=$(printf "[File] %s\n" "$url")
elif [ "$cvs" ]
then fileinfo=$(printf "[File] %s\n" "$cvs")
elif [ "$svn" ]
then fileinfo=$(printf "[File] %s\n" "$svn")
elif [ "$git" ]
then fileinfo=$(printf "[File] %s\n" "$git")
elif [ "$brz" ]
then fileinfo=$(printf "[File] %s\n" "$bzr")
elif [ "$hg" ]
then fileinfo=$(printf "[File] %s\n" "$hg")
fi
local pkgsource=$(printf "%s\n[Distribution] %s\n[Host] %s\n" "$fileinfo" "$distro" "$archinfo")
echo "$pkgsource" | $sudo_exec tee "$target/Resources/PackageSource" >/dev/null || wrap_fail "Failed installing PackageSource file"

Log_Normal "Generating package's build information..."
GenBuildInformation --store "$appname" "$versionnumber" || wrap_fail "Failed installing build information file."

Expand Down Expand Up @@ -284,7 +310,9 @@ function respawn_with_runner() {
if ! Boolean "no-build" && [ -z "$GOBOLINUX_RUNNER" ] && Quiet which Runner && Quiet Runner -c
then
Log_Verbose "Runner is available, using it."
if Boolean "verbose"
if Boolean "debug"
then local quiet="-vv"
elif Boolean "verbose"
then local quiet=
else local quiet="-q"
fi
Expand Down

0 comments on commit c363de4

Please sign in to comment.