Skip to content

Commit

Permalink
[merge] from unstable into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
OneCDOnly committed May 1, 2024
2 parents 2cb9ea1 + 0950795 commit ba86ff7
Show file tree
Hide file tree
Showing 30 changed files with 66 additions and 7,881 deletions.
Binary file modified objects.tar.gz
Binary file not shown.
Binary file removed packages.tar.gz
Binary file not shown.
Binary file modified sherpa-manager.tar.gz
Binary file not shown.
10 changes: 3 additions & 7 deletions support/build-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@ declare -a a
declare -i i=0

a+=("$support_path/$objects_file")
a+=("$support_path/$packages_file")
a+=("$support_path/$management_file")

for i in "${!a[@]}"; do
[[ -e ${a[i]} ]] && rm -f "${a[i]}"
done

./build-qpkgs.sh sherpa || exit
./build-packages.sh || exit
./build-objects.sh || exit
./build-wiki-package-abbreviations.sh || exit
./build-manager.sh || exit
./build-archives.sh || exit
$support_path/build-objects.sh || exit
$support_path/build-manager.sh || exit
$support_path/build-archives.sh || exit
24 changes: 0 additions & 24 deletions support/build-archive.sh_(obsolete)

This file was deleted.

11 changes: 6 additions & 5 deletions support/build-archives.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

# compiler for all sherpa archives.
# compiler for sherpa management archives.

. vars.source || exit

Expand All @@ -11,13 +11,14 @@ declare -a b
declare -i i=0

a+=("$support_path/$objects_file")
b+=("$target_path/$objects_archive_file")
b+=("$root_path/$objects_archive_file")

a+=("$support_path/$packages_file")
b+=("$target_path/$packages_archive_file")
[[ ! -e $support_path/$objects_file ]] && $support_path/build-objects.sh

a+=("$support_path/$management_file")
b+=("$target_path/$management_archive_file")
b+=("$root_path/$management_archive_file")

[[ ! -e $support_path/$management_file ]] && $support_path/build-manager.sh

for i in "${!a[@]}"; do
[[ -e ${b[i]} ]] && rm -f "${b[i]}"
Expand Down
2 changes: 1 addition & 1 deletion support/build-objects.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

. vars.source || exit
. $HOME/scripts/nas/sherpa/support/vars.source || exit # Use full address as this script is called from outside its directory.

echo -n "building 'objects' file ... "

Expand Down
217 changes: 0 additions & 217 deletions support/build-packages.sh

This file was deleted.

Loading

0 comments on commit ba86ff7

Please sign in to comment.