mid-kid
/
RocketLinux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Changing the rules for dir_* variables 

This makes it less readable and clean, but it's necessary for retarded programs misinterpreting double slashes at the beginning.
master
mid-kid 9 years ago
parent
28c54d0810
commit
e25c78acd7
16 changed files with 38 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      astronaut/astronaut.sat
  2. 8
      astronaut/hello.sat
  3. 2
      astronaut/template.sat
  4. 2
      satellites/3dsfat16tool.sat
  5. 22
      satellites/bin/palemoon.sat
  6. 2
      satellites/bin/unetbootin.sat
  7. 2
      satellites/ctrtool.sat
  8. 2
      satellites/libconfig.sat
  9. 2
      satellites/lua.sat
  10. 2
      satellites/makerom.sat
  11. 2
      satellites/markdown.sat
  12. 2
      satellites/padxorer.sat
  13. 4
      satellites/vcs/bannertool.sat
  14. 2
      satellites/vcs/ctrtool-git.sat
  15. 2
      satellites/vcs/makerom-git.sat
  16. 2
      satellites/webfs.sat

12
astronaut/astronaut.sat
View File

@ -9,11 +9,11 @@ extrafile "pacman-astronaut"
extrafile "astronautpkg" extrafile "astronautpkg"
header_end header_end
install -D "astronaut" "$dir_install/$dir_prefix/bin/astronaut" install -D "astronaut" "$dir_install$dir_prefix/bin/astronaut"
install -D "astrohelp" "$dir_install/$dir_prefix/bin/astrohelp" install -D "astrohelp" "$dir_install$dir_prefix/bin/astrohelp"
install -D "freshnaut" "$dir_install/$dir_prefix/bin/freshnaut" install -D "freshnaut" "$dir_install$dir_prefix/bin/freshnaut"
install -D "xbps-astronaut" "$dir_install/$dir_prefix/bin/xbps-astronaut" install -D "xbps-astronaut" "$dir_install$dir_prefix/bin/xbps-astronaut"
install -D "pacman-astronaut" "$dir_install/$dir_prefix/bin/pacman-astronaut" install -D "pacman-astronaut" "$dir_install$dir_prefix/bin/pacman-astronaut"
install -D "astronautpkg" "$dir_install/$dir_prefix/bin/astronautpkg" install -D "astronautpkg" "$dir_install$dir_prefix/bin/astronautpkg"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

8
astronaut/hello.sat
View File

@ -36,6 +36,12 @@ vcs_compile=true # Set this to true if it's a vcs package, and we've just downl
# - vcs_compile # - vcs_compile
# - options # - options
# General info about the usage of these variables:
# - When chaining any of the dir_* variables, do not separate them by a '/'.
# - There's actually just very 2 possible valid chaining combinations for these: Either $dir_sysroot$dir_prefix,
# or $dir_install$dir_prefix
# - Also do not add a '/' at the beginning if you're starting with a dir_* variable.
# Get them files. # Get them files.
# URL [REQUIRED], MD5sum, Custom command # URL [REQUIRED], MD5sum, Custom command
download "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \ download "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
@ -87,7 +93,7 @@ option test echo "Test option enabled"
# Bangs ("!") negate the operation. # Bangs ("!") negate the operation.
make DESTDIR="$dir_install" install make DESTDIR="$dir_install" install
rm "$dir_install/$dir_prefix/share/info/dir" # This file collides with some other packages. rm "$dir_install$dir_prefix/share/info/dir" # This file collides with some other packages.
# Call the function we imported. For more info see the top of the file, and functions/say_hello.sh # Call the function we imported. For more info see the top of the file, and functions/say_hello.sh
say_hello say_hello

2
astronaut/template.sat
View File

@ -14,6 +14,6 @@ cd "$name-$version"
make make
option !no_check make check option !no_check make check
make DESTDIR="$dir_install" install make DESTDIR="$dir_install" install
rm "$dir_install/$dir_prefix/share/info/dir" # This file collides with some other packages. rm "$dir_install$dir_prefix/share/info/dir" # This file collides with some other packages.
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/3dsfat16tool.sat
View File

@ -8,6 +8,6 @@ header_end
cd "$name-$version" cd "$name-$version"
cc -O3 "$name.c" -o "$name" cc -O3 "$name.c" -o "$name"
install -Dm755 "$name" "$dir_install/$dir_prefix/bin/$name" install -Dm755 "$name" "$dir_install$dir_prefix/bin/$name"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

22
satellites/bin/palemoon.sat
View File

@ -7,18 +7,18 @@ download "http://linux.palemoon.org/files/$version/$name-$version.en-US.linux-x8
extrafile "palemoon.desktop" extrafile "palemoon.desktop"
header_end header_end
mkdir -p "$dir_install/opt" "$dir_install/$dir_prefix/bin" "$dir_install/$dir_prefix/share/applications" \ mkdir -p "$dir_install/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/16x16/apps" \
"$dir_install/$dir_prefix/share/icons/hicolor/32x32/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/48x48/apps" \
"$dir_install/$dir_prefix/share/icons/hicolor/128x128/apps" \ "$dir_install$dir_prefix/share/icons/hicolor/128x128/apps" \
extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/opt" extract "$name-$version.en-US.linux-x86_64.tar.bz2" "$dir_install/opt"
ln -s "$dir_sysroot/opt/$name/$name" "$dir_install/$dir_prefix/bin/$name" 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/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/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/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" 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" cp "palemoon.desktop" "$dir_install$dir_prefix/share/applications/palemoon.desktop"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/bin/unetbootin.sat
View File

@ -6,6 +6,6 @@ dlfile "https://launchpad.net/$name/trunk/$version/+download/$name-linux64-$vers
"d5d1cddc144fc64d8291c33ebd4f457b" "d5d1cddc144fc64d8291c33ebd4f457b"
header_end header_end
install -D $name-linux64-$version.bin "$dir_install/$dir_prefix/bin/$name" install -D $name-linux64-$version.bin "$dir_install$dir_prefix/bin/$name"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/ctrtool.sat
View File

@ -9,6 +9,6 @@ header_end
cd "$name-$version/ctrtool" cd "$name-$version/ctrtool"
make make
install -D ctrtool "$dir_install/$dir_prefix/bin/ctrtool" install -D ctrtool "$dir_install$dir_prefix/bin/ctrtool"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/libconfig.sat
View File

@ -10,6 +10,6 @@ header_end
cd "$name-$version" cd "$name-$version"
compile_configure compile_configure
rm "$dir_install/$dir_prefix/share/info/dir" rm "$dir_install$dir_prefix/share/info/dir"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/lua.sat
View File

@ -9,6 +9,6 @@ header_end
cd "$name-$version" cd "$name-$version"
make MYLIBS="-lncurses" MYCFLAGS="$CFLAGS" linux make MYLIBS="-lncurses" MYCFLAGS="$CFLAGS" linux
option !no_check make test option !no_check make test
make INSTALL_TOP="$dir_install/$dir_prefix" install make INSTALL_TOP="$dir_install$dir_prefix" install
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/makerom.sat
View File

@ -9,6 +9,6 @@ header_end
cd "$name-$version/makerom" cd "$name-$version/makerom"
make make
install -D makerom "$dir_install/$dir_prefix/bin/makerom" install -D makerom "$dir_install$dir_prefix/bin/makerom"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/markdown.sat
View File

@ -9,6 +9,6 @@ header_end
# TODO: Support other formats, such as zip, with the extract command. # TODO: Support other formats, such as zip, with the extract command.
extract "${name}_$version.zip" "" \ extract "${name}_$version.zip" "" \
"unzip -qd {dst} {src}" "unzip -qd {dst} {src}"
install -D "${name}_$version/$name.pl" "$dir_install/$dir_prefix/bin/markdown" install -D "${name}_$version/$name.pl" "$dir_install$dir_prefix/bin/markdown"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/padxorer.sat
View File

@ -7,6 +7,6 @@ dlfile "http://pastebin.com/raw/$paste" \
header_end header_end
cc -x c -O3 "$paste" -o "$name" cc -x c -O3 "$paste" -o "$name"
install -Dm755 "$name" "$dir_install/$dir_prefix/bin/$name" install -Dm755 "$name" "$dir_install$dir_prefix/bin/$name"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

4
satellites/vcs/bannertool.sat
View File

@ -8,8 +8,8 @@ header_end
cd "$name" cd "$name"
# Fix retarded build system # Fix retarded build system
sed -i -e "s@/usr/local@'$dir_install/$dir_prefix'@g" buildtools/make_base sed -i -e "s@/usr/local@'$dir_install$dir_prefix'@g" buildtools/make_base
mkdir -p "$dir_install/$dir_prefix/bin" mkdir -p "$dir_install$dir_prefix/bin"
make make
make install make install

2
satellites/vcs/ctrtool-git.sat
View File

@ -7,6 +7,6 @@ header_end
cd "$name/ctrtool" cd "$name/ctrtool"
make make
install -D ctrtool "$dir_install/$dir_prefix/bin/ctrtool" install -D ctrtool "$dir_install$dir_prefix/bin/ctrtool"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/vcs/makerom-git.sat
View File

@ -7,6 +7,6 @@ header_end
cd "$name/makerom" cd "$name/makerom"
make make
install -D makerom "$dir_install/$dir_prefix/bin/makerom" install -D makerom "$dir_install$dir_prefix/bin/makerom"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

2
satellites/webfs.sat
View File

@ -14,6 +14,6 @@ sed -i -e "s/echo -e/echo/g" mk/Autoconf.mk
sed -i -e "s@/etc/mime.types@/dev/null@g" GNUmakefile sed -i -e "s@/etc/mime.types@/dev/null@g" GNUmakefile
make make
install -D "${name}d" "$dir_install/$dir_prefix/bin/${name}d" install -D "${name}d" "$dir_install$dir_prefix/bin/${name}d"
# vim:set tabstop=4 shiftwidth=4 syntax=sh et: # vim:set tabstop=4 shiftwidth=4 syntax=sh et:

Write Preview
Loading…
Cancel
Save