Browse Source

Revert some old stupid change

master
mid-kid 9 years ago
parent
commit
58c7b8bf64
  1. 6
      astronaut/astronaut

6
astronaut/astronaut

@ -8,7 +8,7 @@ dir_sysroot="" # The root dir (The directory programs will look in and symlinks
dir_prefix="usr" # Prefix directory dir_prefix="usr" # Prefix directory
cmd_download="curl -# -L -o {dst} {src}" # Command to execute to download files 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 cmd_extract="tar -x -C {dst} -f {src}" # Command to execute to extract files
unset _dir_satellites # Directory where the satellite files are placed. unset dir_satellites # Directory where the satellite files are placed.
unset options unset options
[ -f /etc/astronaut.conf ] && . /etc/astronaut.conf [ -f /etc/astronaut.conf ] && . /etc/astronaut.conf
[ -f "$HOME/.astronaut.conf" ] && . "$HOME/.astronaut.conf" [ -f "$HOME/.astronaut.conf" ] && . "$HOME/.astronaut.conf"
@ -204,8 +204,8 @@ _satname="$(basename "$_satellite" .sat)"
# Try to find the satellite file if it can't be found. # Try to find the satellite file if it can't be found.
if [ ! -f "$_satellite" ]; then if [ ! -f "$_satellite" ]; then
if [ -d "$_dir_satellites" ]; then if [ -d "$dir_satellites" ]; then
file="$(find "$_dir_satellites" -type f \( -name "$_satname.sat" -o -name "$_satname" \) -print -quit)" file="$(find "$dir_satellites" -type f \( -name "$_satname.sat" -o -name "$_satname" \) -print -quit)"
if [ -f "$file" ]; then if [ -f "$file" ]; then
_satellite="$(realpath "$file")" _satellite="$(realpath "$file")"
_satname="$(basename "$_satellite" .sat)" _satname="$(basename "$_satellite" .sat)"

Loading…
Cancel
Save