@@ -162,41 +162,41 @@ function compile_giomodules {
162162 if [ -f " $1 /glib-2.0/gio-querymodules" ]; then
163163 rm -rf " $GIO_MODULE_DIR "
164164 ensure_dir_exists " $GIO_MODULE_DIR "
165- ln -s " $1 " /gio/modules/* .so " $GIO_MODULE_DIR "
165+ ln -s " $SNAP " /usr/lib/ " $ARCH " /gio/modules/* .so " $GIO_MODULE_DIR "
166166 " $1 /glib-2.0/gio-querymodules" " $GIO_MODULE_DIR "
167167 fi
168168}
169169if [ " $needs_update " = true ]; then
170- async_exec compile_giomodules " $SNAP /usr/lib/$ARCH "
170+ async_exec compile_giomodules " /snap/core20/current /usr/lib/$ARCH "
171171fi
172172
173173# Setup compiled gsettings schema
174- GS_SCHEMA_DIR =" $SNAP_USER_DATA /.local/share/glib-2.0/schemas"
174+ export GSETTINGS_SCHEMA_DIR =" $SNAP_USER_DATA /.local/share/glib-2.0/schemas"
175175function compile_schemas {
176176 if [ -f " $1 " ]; then
177- rm -rf " $GS_SCHEMA_DIR "
178- ensure_dir_exists " $GS_SCHEMA_DIR "
177+ rm -rf " $GSETTINGS_SCHEMA_DIR "
178+ ensure_dir_exists " $GSETTINGS_SCHEMA_DIR "
179179 for (( i = 0 ; i < ${# data_dirs_array[@]} ; i++ )) ; do
180180 schema_dir=" ${data_dirs_array[$i]} /glib-2.0/schemas"
181181 if [ -f " $schema_dir /gschemas.compiled" ]; then
182182 # This directory already has compiled schemas
183183 continue
184184 fi
185185 if [ -n " $( ls -A " $schema_dir " /* .xml 2> /dev/null) " ]; then
186- ln -s " $schema_dir " /* .xml " $GS_SCHEMA_DIR "
186+ ln -s " $schema_dir " /* .xml " $GSETTINGS_SCHEMA_DIR "
187187 fi
188188 if [ -n " $( ls -A " $schema_dir " /* .override 2> /dev/null) " ]; then
189- ln -s " $schema_dir " /* .override " $GS_SCHEMA_DIR "
189+ ln -s " $schema_dir " /* .override " $GSETTINGS_SCHEMA_DIR "
190190 fi
191191 done
192192 # Only compile schemas if we copied anything
193- if [ -n " $( ls -A " $GS_SCHEMA_DIR " /* .xml " $GS_SCHEMA_DIR " /* .override 2> /dev/null) " ]; then
194- " $1 " " $GS_SCHEMA_DIR "
193+ if [ -n " $( ls -A " $GSETTINGS_SCHEMA_DIR " /* .xml " $GSETTINGS_SCHEMA_DIR " /* .override 2> /dev/null) " ]; then
194+ " $1 " " $GSETTINGS_SCHEMA_DIR "
195195 fi
196196 fi
197197}
198198if [ " $needs_update " = true ]; then
199- async_exec compile_schemas " $SNAP /usr/lib/$ARCH /glib-2.0/glib-compile-schemas"
199+ async_exec compile_schemas " /snap/core20/current /usr/lib/$ARCH /glib-2.0/glib-compile-schemas"
200200fi
201201
202202# Gdk-pixbuf loaders
0 commit comments