@@ -40,60 +40,60 @@ for SYSTEM in arch debian fedora cygwin homebrew conda; do
4040 fi
4141 PKG_TYPE=$( cat $PKG_SCRIPTS /type)
4242 if [ -f $SYSTEM_PACKAGES_FILE ]; then
43- PKG_SYSTEM_PACKAGES=$( echo $( ${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE ) )
44- if [ -n " PKG_SYSTEM_PACKAGES" ]; then
45- if [ -f $PKG_SCRIPTS /spkg-configure.m4 ]; then
46- case " $PKG_TYPE " in
47- standard)
48- SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES "
49- ;;
50- * )
51- OPTIONAL_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES "
52- ;;
53- esac
54- else
55- case " $PKG_TYPE " in
56- standard)
57- SAGELIB_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES "
58- ;;
59- * )
60- SAGELIB_OPTIONAL_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES "
61- ;;
62- esac
63- fi
64- fi
43+ PKG_SYSTEM_PACKAGES=$( echo $( ${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE ) )
44+ if [ -n " PKG_SYSTEM_PACKAGES" ]; then
45+ if [ -f $PKG_SCRIPTS /spkg-configure.m4 ]; then
46+ case " $PKG_TYPE " in
47+ standard)
48+ SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES "
49+ ;;
50+ * )
51+ OPTIONAL_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES "
52+ ;;
53+ esac
54+ else
55+ case " $PKG_TYPE " in
56+ standard)
57+ SAGELIB_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES "
58+ ;;
59+ * )
60+ SAGELIB_OPTIONAL_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES "
61+ ;;
62+ esac
63+ fi
64+ fi
6565 fi
6666 fi
6767 done
6868 if [ " ${SYSTEM} " = " conda" ]; then
6969 if [ " ${BOOTSTRAP_QUIET} " = " no" ]; then
70- echo >&2 $0 :$LINENO : installing environment.yml, environment-optional.yml, src/environment.yml and src/environment-optional.yml
70+ echo >&2 $0 :$LINENO : installing environment.yml, environment-optional.yml, src/environment.yml and src/environment-optional.yml
7171 fi
7272 echo " name: sage-build" > environment.yml
73- echo " channels:" >> environment.yml
74- echo " - conda-forge" >> environment.yml
75- echo " - nodefaults" >> environment.yml
76- echo " dependencies:" >> environment.yml
77- for pkg in $SYSTEM_PACKAGES ; do
73+ echo " channels:" >> environment.yml
74+ echo " - conda-forge" >> environment.yml
75+ echo " - nodefaults" >> environment.yml
76+ echo " dependencies:" >> environment.yml
77+ for pkg in $SYSTEM_PACKAGES ; do
7878 echo " - $pkg " >> environment.yml
79- done
80- cp environment.yml src/environment.yml
81- for pkg in $SAGELIB_SYSTEM_PACKAGES ; do
79+ done
80+ cp environment.yml src/environment.yml
81+ for pkg in $SAGELIB_SYSTEM_PACKAGES ; do
8282 echo " - $pkg " >> src/environment.yml
83- done
84- cp environment.yml environment-optional.yml
85- echo " # optional packages" >> environment-optional.yml
86- for pkg in $OPTIONAL_SYSTEM_PACKAGES ; do
87- echo " - $pkg " >> environment-optional.yml
8883 done
89- cp src/environment.yml src/environment-optional.yml
90- echo " # optional packages" >> src/environment-optional.yml
91- for pkg in $OPTIONAL_SYSTEM_PACKAGES $SAGELIB_OPTIONAL_SYSTEM_PACKAGES ; do
84+ cp environment.yml environment-optional.yml
85+ echo " # optional packages" >> environment-optional.yml
86+ for pkg in $OPTIONAL_SYSTEM_PACKAGES ; do
87+ echo " - $pkg " >> environment-optional.yml
88+ done
89+ cp src/environment.yml src/environment-optional.yml
90+ echo " # optional packages" >> src/environment-optional.yml
91+ for pkg in $OPTIONAL_SYSTEM_PACKAGES $SAGELIB_OPTIONAL_SYSTEM_PACKAGES ; do
9292 echo " - $pkg " >> src/environment-optional.yml
93- done
93+ done
9494 else
9595 if [ " ${BOOTSTRAP_QUIET} " = " no" ]; then
96- echo >&2 $0 :$LINENO : installing " $OUTPUT_DIR " /$SYSTEM .txt and " $OUTPUT_DIR " /$SYSTEM -optional.txt
96+ echo >&2 $0 :$LINENO : installing " $OUTPUT_DIR " /$SYSTEM .txt and " $OUTPUT_DIR " /$SYSTEM -optional.txt
9797 fi
9898 echo " $( sage-print-system-package-command $SYSTEM --prompt --sudo install $( echo $( echo $SYSTEM_PACKAGES | xargs -n 1 echo | sort) ) ) " > " $OUTPUT_DIR " /$SYSTEM .txt
9999 echo " $( sage-print-system-package-command $SYSTEM --prompt --sudo install $( echo $( echo $OPTIONAL_SYSTEM_PACKAGES | xargs -n 1 echo | sort) ) ) " > " $OUTPUT_DIR " /$SYSTEM -optional.txt
0 commit comments