Imported Upstream version 4.0.5

install/ui/util/build.sh

@@ -20,7 +20,6 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Build script for FreeIPA Web UI
-set -o errexit
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

install/ui/util/change-profile.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 RDIR=$DIR/../release
@@ -140,4 +139,4 @@ pushd $DIR/../js
         git update-index --no-assume-unchanged ./dojo
         git update-index --no-assume-unchanged ./freeipa
     fi
-popd
+popd

install/ui/util/clean.sh

@@ -18,10 +18,9 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 # Clean after build
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-rm -rf $DIR/../release
+rm -rf $DIR/../release

install/ui/util/compile.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 RDIR=$DIR/../release

install/ui/util/make-builder.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 # Build DOJO builder, overwrites util/build/build.js. Cleans after itself.
 
@@ -48,4 +47,4 @@ $DIR/clean.sh
 
 # Delete DOJO symbolic links
 rm -f $DIR/../src/dojo
-rm -f $DIR/../src/build
+rm -f $DIR/../src/build

install/ui/util/make-css.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

install/ui/util/make-dojo.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 # Build script for Dojo library
 
@@ -36,4 +35,4 @@ if [[ $? != 0 ]] ; then
 fi
 
 $DIR/compile.sh --release dojo --layer dojo/dojo --output $DIR/../build/dojo/dojo.js
-$DIR/clean.sh
+$DIR/clean.sh

install/ui/util/make-patternfly.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

install/ui/util/make-ui.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 # Build script for FreeIPA Web UI
 
@@ -34,4 +33,4 @@ $DIR/build.sh webui
 # don't stop at error. Some dependency errors are expected.
 $DIR/compile.sh --release lib --layer freeipa/core --output $IPA_DIR/core.js
 $DIR/compile.sh --release lib --layer freeipa/app --output $IPA_DIR/app.js
-$DIR/clean.sh
+$DIR/clean.sh

install/ui/util/prepare-dojo.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 #
 # This script prepares working enviroment to use dojo toolkit.
@@ -203,4 +202,4 @@ if [[ $UTIL = $YES ]] ; then
     fi
 fi
 
-popd # $DOJO_DIR
+popd # $DOJO_DIR

install/ui/util/sync.sh

@@ -18,7 +18,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-set -o errexit
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 RDIR=$DIR/../release
@@ -61,7 +60,7 @@ OPTIONS
     --config
                 files from html/
     --strings
-                ipaserver/plugins/internal.py
+                ipalib/plugins/internal.py
     -C
     --compiled
                 changes source dir of --freeipa and --dojo to /src/build/freeipa
@@ -341,8 +340,8 @@ pushd $DIR/../../ #freeipa/install
 popd
 
 if [[ $STRINGS ]] ; then
-    SOURCE=ipaserver/plugins/internal.py
-    TARGET=/usr/lib/python2.7/site-packages/ipaserver/plugins
+    SOURCE=ipalib/plugins/internal.py
+    TARGET=/usr/lib/python2.7/site-packages/ipalib/plugins
     RECURSIVE=0
     CLEAN=0 # don't clean entire folder
     pushd $DIR/../../../
@@ -358,4 +357,4 @@ if [[ $RESTART ]] ; then
         echo "Restarting httpd: $HOST"
         ssh $HOST "systemctl restart httpd.service"
     fi
-fi
+fi