diff --git a/astronaut/astronaut b/astronaut/astronaut index c983b3d..abe7fb1 100755 --- a/astronaut/astronaut +++ b/astronaut/astronaut @@ -4,8 +4,7 @@ dir_build="/tmp/astronaut/build" # Temporary directory to build packages dir_source="/tmp/astronaut/source" # Directory where the package sources will be placed dir_install="/tmp/astronaut/install" # Directory where the package will be installed -dir_sysroot="" # The directory to look for libraries for the target system -dir_preprefix="/" # Upper prefix directory (for /etc, /opt and such. Don't ask me why people decided to put them in a different dir. It's pretty retarded.) +dir_sysroot="" # The root directory of the system dir_prefix="/usr" # Prefix directory (for /bin, /lib, /share and such) cmd_download="curl -# -L -o {dst} {src}" # Command to execute to download files cmd_extract="tar -x -C {dst} -f {src}" # Command to execute to extract files @@ -31,7 +30,6 @@ Usage: $0 [-sbipr ] [-Id] [-o ] -s Set source directory -i Set install directory -r Set root directory --e Set pre-prefix directory -p Set prefix directory -I Nuke install directory before build [WARNING: You will not be prompted] -d Only download package files @@ -49,7 +47,7 @@ _exiterr() { } # Gather info -while getopts "h?s:b:i:r:e:p:IcCdvo:" opt; do +while getopts "h?s:b:i:r:p:IcCdvo:" opt; do case "$opt" in h|\?) _show_help @@ -67,9 +65,6 @@ while getopts "h?s:b:i:r:e:p:IcCdvo:" opt; do r) dir_sysroot="$OPTARG" ;; - e) - dir_preprefix="$OPTARG" - ;; p) dir_prefix="$OPTARG" ;; @@ -96,9 +91,6 @@ if [ ! "$1" ]; then exit 1 fi -# Modify some variables -dir_prefix="$dir_preprefix/$dir_prefix" - # Tools for the astronaut _mksum() { echo "$(md5sum "$@" 2> /dev/null | cut -d' ' -f1)" diff --git a/astronaut/hello.sat b/astronaut/hello.sat index 57298f7..7fce77e 100644 --- a/astronaut/hello.sat +++ b/astronaut/hello.sat @@ -28,7 +28,6 @@ vcs_compile=true # Set this to true if it's a vcs package, and we've just downl # "Look, but don't touch"-variables: # - dir_install # - dir_sysroot -# - dir_preprefix # - dir_prefix # "You'll only make your own life more difficult if you use them wrong, so I don't care what you do"-variables: # (Only use these to change the behaviour of some commands over the whole script.) diff --git a/satellites/bin/devkitarm.sat b/satellites/bin/devkitarm.sat index 34780a7..e7db596 100644 --- a/satellites/bin/devkitarm.sat +++ b/satellites/bin/devkitarm.sat @@ -8,9 +8,9 @@ download "https://sourceforge.net/projects/devkitpro/files/$name/${name}_$versio extrafile "devkitarm.sh" header_end -mkdir -p "$dir_install/$dir_preprefix/opt/devkitPRO" -extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/$dir_preprefix/opt/devkitPRO" -sed -i -e "s@%PREFIX%@$dir_preprefix@g" devkitarm.sh -install -Dm644 devkitarm.sh "$dir_install/$dir_preprefix/etc/profile.d/devkitarm.sh" +mkdir -p "$dir_install/$dir_sysroot/opt/devkitPRO" +extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/$dir_sysroot/opt/devkitPRO" +sed -i -e "s@%PREFIX%@$dir_sysroot@g" devkitarm.sh +install -Dm644 devkitarm.sh "$dir_install/$dir_sysroot/etc/profile.d/devkitarm.sh" # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/bin/palemoon.sat b/satellites/bin/palemoon.sat index f2ed906..3fbe945 100644 --- a/satellites/bin/palemoon.sat +++ b/satellites/bin/palemoon.sat @@ -7,18 +7,18 @@ download "http://linux.palemoon.org/files/$version/$name-$version.en-US.linux-x8 extrafile "palemoon.desktop" header_end -mkdir -p "$dir_install/$dir_preprefix/opt" "$dir_install/$dir_prefix/bin" "$dir_install/$dir_prefix/share/applications" \ +mkdir -p "$dir_install/$dir_sysroot/opt" "$dir_install/$dir_prefix/bin" "$dir_install/$dir_prefix/share/applications" \ "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps" \ "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps" \ "$dir_install/$dir_prefix/share/icons/hicolor/48x48/apps" \ "$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps" \ -extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/$dir_preprefix/opt" -ln -s "$dir_preprefix/opt/$name/$name" "$dir_install/$dir_prefix/bin/$name" -ln -s "$dir_preprefix/opt/$name/browser/chrome/icons/default/default16.png" "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps/$name.png" -ln -s "$dir_preprefix/opt/$name/browser/chrome/icons/default/default32.png" "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps/$name.png" -ln -s "$dir_preprefix/opt/$name/browser/chrome/icons/default/default48.png" "$dir_install/$dir_prefix/share/icons/hicolor/48x48/apps/$name.png" -ln -s "$dir_preprefix/opt/$name/browser/icons/mozicon128.png" "$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps/$name.png" +extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/$dir_sysroot/opt" +ln -s "$dir_sysroot/opt/$name/$name" "$dir_install/$dir_prefix/bin/$name" +ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default16.png" "$dir_install/$dir_prefix/share/icons/hicolor/16x16/apps/$name.png" +ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default32.png" "$dir_install/$dir_prefix/share/icons/hicolor/32x32/apps/$name.png" +ln -s "$dir_sysroot/opt/$name/browser/chrome/icons/default/default48.png" "$dir_install/$dir_prefix/share/icons/hicolor/48x48/apps/$name.png" +ln -s "$dir_sysroot/opt/$name/browser/icons/mozicon128.png" "$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps/$name.png" cp "palemoon.desktop" "$dir_install/$dir_prefix/share/applications/palemoon.desktop" # vim:set tabstop=4 shiftwidth=4 syntax=sh et: