radareorg / iaito

Official QT frontend of radare2
GNU General Public License v3.0
968 stars 83 forks source link

Merge Conflict Text in appbundle_embed_python.sh #159

Closed manufactor01 closed 5 months ago

manufactor01 commented 5 months ago

Script appbundle_embed_python.sh has this lines:

echo "Making executable $executable point to embedded Framework"
install_name_tool -change `otool -L "$executable" | sed -n "s/^[[:blank:]]*\([^[:blank:]]*Python\) (.*$/\1/p"` @executable_path/../Frameworks/Python.framework/Versions/Current/Python "$executable" 

<<<<<<< HEAD:scripts/appbundle_embed_python.sh
echo "Cleaning up embedded Python Framework"
cd "$appbundle/Contents/Frameworks/Python.framework" || exit 1
find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf || exit 1
rm -r Versions/Current/Resources/* Versions/Current/lib/python3.6/test Versions/Current/lib/python3.6/idlelib Versions/Current/lib/python3.6/curses Versions/Current/lib/python3.6/lib2to3 || exit 1

=======
>>>>>>> 29cbd06a... Run macos packaging in GHA. (#2529):dist/appbundle_embed_python.sh
echo "Checking if PySide2 is available"

pyside_prefix=$(pkg-config --variable=prefix pyside2)
if [ $? -ne 0 ]; then
    echo "PySide2 is not available, ignoring."
    exit 0
fi
trufae commented 5 months ago

I dont think any of the scripts in this directory makes any sense to keep them there bwcauae they are all broken

trufae commented 5 months ago

Python support was removed 4 years ago

trufae commented 5 months ago

Fixed via https://github.com/radareorg/iaito/pull/160