Skip to content

Commit

Permalink
replace all freecadweb instances with freecad [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianinsaval committed Aug 17, 2023
1 parent 1bbed5b commit 8801eb1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion conda/linux/AppDir/AppRun
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if [ "$DOC" = 1 ]; then
fi

# SSL
# https://forum.freecadweb.org/viewtopic.php?f=4&t=34873&start=20#p327416
# https://forum.freecad.org/viewtopic.php?f=4&t=34873&start=20#p327416
export SSL_CERT_FILE=$PREFIX/ssl/cacert.pem
# https://github.com/FreeCAD/FreeCAD-AppImage/pull/20
export GIT_SSL_CAINFO=$HERE/usr/ssl/cacert.pem
Expand Down
4 changes: 2 additions & 2 deletions conda/osx/APP/FreeCAD.app/Contents/MacOS/FreeCAD
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export PYTHONHOME=${PREFIX}
# export QT_XKB_CONFIG_ROOT=${PREFIX}/lib
export FONTCONFIG_FILE=/etc/fonts/fonts.conf
export FONTCONFIG_PATH=/etc/fonts
export LANG="UTF-8" # https://forum.freecadweb.org/viewtopic.php?f=22&t=42644
export SSL_CERT_FILE=${PREFIX}/ssl/cacert.pem # https://forum.freecadweb.org/viewtopic.php?f=3&t=42825
export LANG="UTF-8" # https://forum.freecad.org/viewtopic.php?f=22&t=42644
export SSL_CERT_FILE=${PREFIX}/ssl/cacert.pem # https://forum.freecad.org/viewtopic.php?f=3&t=42825
export GIT_SSL_CAINFO=${PREFIX}/ssl/cacert.pem

if [[ `sw_vers -productVersion` > 10.99 ]] ; then
Expand Down
2 changes: 1 addition & 1 deletion conda/osx/Info.plist.template
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleIconFile</key>
<string>freecad.icns</string>
<key>CFBundleIdentifier</key>
<string>org.freecadweb.FreeCAD</string>
<string>org.freecad.FreeCAD</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
Expand Down
2 changes: 1 addition & 1 deletion conda/win/ssl-patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
ALERT_DESCRIPTION_BAD_CERTIFICATE_HASH_VALUE
ALERT_DESCRIPTION_UNKNOWN_PSK_IDENTITY
"""
# Workaround see https://forum.freecadweb.org/viewtopic.php?f=42&t=47095
# Workaround see https://forum.freecad.org/viewtopic.php?f=42&t=47095
CERTS_IGNORE = ["MUP Republike Srbije"]

import sys
Expand Down

0 comments on commit 8801eb1

Please sign in to comment.