Lines 56-73
run_rebuild_zebra()
Link Here
|
56 |
[ "${full_reindex}" = "yes" ] || |
56 |
[ "${full_reindex}" = "yes" ] || |
57 |
[ "${force}" = "yes" ] ; then |
57 |
[ "${force}" = "yes" ] ; then |
58 |
|
58 |
|
59 |
if [ "$GIT_INSTALL" = "" ]; then |
|
|
60 |
KOHA_BINDIR=$KOHA_HOME/bin |
61 |
else |
62 |
KOHA_BINDIR=$KOHA_HOME/misc |
63 |
fi |
64 |
|
65 |
# TODO: This comment is here to remind us that we should make |
59 |
# TODO: This comment is here to remind us that we should make |
66 |
# rebuild_zebra.pl return error codes on failure |
60 |
# rebuild_zebra.pl return error codes on failure |
67 |
if sudo -u "$instancename-koha" -H \ |
61 |
if sudo -u "$instancename-koha" -H \ |
68 |
env PERL5LIB=$PERL5LIB \ |
62 |
env PERL5LIB=$PERL5LIB \ |
69 |
KOHA_CONF="/etc/koha/sites/$instancename/koha-conf.xml" \ |
63 |
KOHA_CONF="/etc/koha/sites/$instancename/koha-conf.xml" \ |
70 |
$KOHA_BINDIR/migration_tools/rebuild_zebra.pl $@ ; then |
64 |
$KOHA_HOME/$KOHA_BINDIR/migration_tools/rebuild_zebra.pl $@ ; then |
71 |
return 0 |
65 |
return 0 |
72 |
else |
66 |
else |
73 |
return 1 |
67 |
return 1 |
Lines 148-157
while [ -n "$*" ]; do
Link Here
|
148 |
shift |
142 |
shift |
149 |
done |
143 |
done |
150 |
|
144 |
|
151 |
# Optionally use alternative paths for a dev install |
|
|
152 |
adjust_paths_git_install $1 |
153 |
|
154 |
# Parse command line. |
155 |
if [ $# -lt 1 ]; then |
145 |
if [ $# -lt 1 ]; then |
156 |
if [ "$quiet" = "no" ]; then |
146 |
if [ "$quiet" = "no" ]; then |
157 |
usage |
147 |
usage |
Lines 165-170
fi
Link Here
|
165 |
for name in "$@" |
155 |
for name in "$@" |
166 |
do |
156 |
do |
167 |
if is_instance $name; then |
157 |
if is_instance $name; then |
|
|
158 |
|
159 |
adjust_paths_git_install $name |
160 |
|
168 |
if [ "$biblios" = "yes" ]; then |
161 |
if [ "$biblios" = "yes" ]; then |
169 |
if ! run_rebuild_zebra $name \ |
162 |
if ! run_rebuild_zebra $name \ |
170 |
-b $opt_verbose $opt_idx $opts_other; then |
163 |
-b $opt_verbose $opt_idx $opts_other; then |