From c4d11a13357812c24dad800028a43d49bf9d65e5 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 14 Apr 2016 20:25:06 +0200 Subject: [PATCH] Move astronaut.sat into the astronaut dir, set default directories to /tmp Creating the directories in PWD is kind of irritating --- astronaut/astronaut | 6 +++--- astronaut/astronaut.sat | 19 +++++++++++++++++++ astronaut/extrafiles/astronaut | 1 + satellites/astronaut.sat | 20 +------------------- satellites/extrafiles/astronaut | 1 - 5 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 astronaut/astronaut.sat create mode 120000 astronaut/extrafiles/astronaut mode change 100644 => 120000 satellites/astronaut.sat delete mode 120000 satellites/extrafiles/astronaut diff --git a/astronaut/astronaut b/astronaut/astronaut index 09a3e28..91b10bd 100755 --- a/astronaut/astronaut +++ b/astronaut/astronaut @@ -1,9 +1,9 @@ #!/bin/sh -e # Configuration -dir_build="$PWD/build" # Temporary directory to build packages -dir_source="$PWD/source" # Directory where the package sources will be placed -dir_install="$PWD/install" # Directory where the package will be installed +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 root dir (The directory programs will look in and symlinks will point to) dir_prefix="/usr" # Prefix directory cmd_download="curl -# -L -o {dst} {src}" # Command to execute to download files diff --git a/astronaut/astronaut.sat b/astronaut/astronaut.sat new file mode 100644 index 0000000..1d81a10 --- /dev/null +++ b/astronaut/astronaut.sat @@ -0,0 +1,19 @@ +name=astronaut +version=$(date +%Y%m%d) + +extrafile "astronaut" +extrafile "astrohelp" +extrafile "freshnaut" +extrafile "xbps-astronaut" +extrafile "pacman-astronaut" +extrafile "astronautpkg" +header_end + +install -D "astronaut" "$dir_install/$dir_prefix/bin/astronaut" +install -D "astrohelp" "$dir_install/$dir_prefix/bin/astrohelp" +install -D "freshnaut" "$dir_install/$dir_prefix/bin/freshnaut" +install -D "xbps-astronaut" "$dir_install/$dir_prefix/bin/xbps-astronaut" +install -D "pacman-astronaut" "$dir_install/$dir_prefix/bin/pacman-astronaut" +install -D "astronautpkg" "$dir_install/$dir_prefix/bin/astronautpkg" + +# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/astronaut/extrafiles/astronaut b/astronaut/extrafiles/astronaut new file mode 120000 index 0000000..a96aa0e --- /dev/null +++ b/astronaut/extrafiles/astronaut @@ -0,0 +1 @@ +.. \ No newline at end of file diff --git a/satellites/astronaut.sat b/satellites/astronaut.sat deleted file mode 100644 index 1d81a10..0000000 --- a/satellites/astronaut.sat +++ /dev/null @@ -1,19 +0,0 @@ -name=astronaut -version=$(date +%Y%m%d) - -extrafile "astronaut" -extrafile "astrohelp" -extrafile "freshnaut" -extrafile "xbps-astronaut" -extrafile "pacman-astronaut" -extrafile "astronautpkg" -header_end - -install -D "astronaut" "$dir_install/$dir_prefix/bin/astronaut" -install -D "astrohelp" "$dir_install/$dir_prefix/bin/astrohelp" -install -D "freshnaut" "$dir_install/$dir_prefix/bin/freshnaut" -install -D "xbps-astronaut" "$dir_install/$dir_prefix/bin/xbps-astronaut" -install -D "pacman-astronaut" "$dir_install/$dir_prefix/bin/pacman-astronaut" -install -D "astronautpkg" "$dir_install/$dir_prefix/bin/astronautpkg" - -# vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/astronaut.sat b/satellites/astronaut.sat new file mode 120000 index 0000000..df636ec --- /dev/null +++ b/satellites/astronaut.sat @@ -0,0 +1 @@ +../astronaut/astronaut.sat \ No newline at end of file diff --git a/satellites/extrafiles/astronaut b/satellites/extrafiles/astronaut deleted file mode 120000 index dbaeeb9..0000000 --- a/satellites/extrafiles/astronaut +++ /dev/null @@ -1 +0,0 @@ -../../astronaut \ No newline at end of file