mirror of
https://forge.fsky.io/oneflux/omegafox.git
synced 2026-02-10 10:12:06 -08:00
Compare commits
No commits in common. "46edfad843e1c4f4096011d454a03e49bd8e5351" and "1a1deb8c24674ed8f228c00841540742d1b0ca11" have entirely different histories.
46edfad843
...
1a1deb8c24
2 changed files with 13 additions and 12 deletions
File diff suppressed because one or more lines are too long
|
|
@ -30,15 +30,15 @@ def add_includes_to_package(package_file, includes, fonts, new_file, target):
|
||||||
target=target,
|
target=target,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Move contents out of omegafox folder if it exists
|
# Move contents out of testfox folder if it exists
|
||||||
old_omegafox_dir = os.path.join(temp_dir, 'omegafox')
|
old_testfox_dir = os.path.join(temp_dir, 'testfox')
|
||||||
omegafox_dir = os.path.join(temp_dir, 'omegafox-folder')
|
testfox_dir = os.path.join(temp_dir, 'testfox-folder')
|
||||||
if os.path.exists(old_omegafox_dir):
|
if os.path.exists(old_testfox_dir):
|
||||||
# Rename omegafox_dir
|
# Rename testfox_dir
|
||||||
os.rename(old_omegafox_dir, omegafox_dir)
|
os.rename(old_testfox_dir, testfox_dir)
|
||||||
for item in os.listdir(omegafox_dir):
|
for item in os.listdir(testfox_dir):
|
||||||
shutil.move(os.path.join(omegafox_dir, item), temp_dir)
|
shutil.move(os.path.join(testfox_dir, item), temp_dir)
|
||||||
os.rmdir(omegafox_dir)
|
os.rmdir(testfox_dir)
|
||||||
|
|
||||||
# Create target_dir
|
# Create target_dir
|
||||||
target_dir = temp_dir
|
target_dir = temp_dir
|
||||||
|
|
@ -66,8 +66,9 @@ def add_includes_to_package(package_file, includes, fonts, new_file, target):
|
||||||
|
|
||||||
# Add hardened-malloc
|
# Add hardened-malloc
|
||||||
shutil.copy2(
|
shutil.copy2(
|
||||||
os.path.join('libhardened_malloc.so'),
|
os.path.join('libhadened_malloc.so'),
|
||||||
os.path.join(target_dir, 'libhardened_malloc.so')
|
os.path.join(target_dir, 'libhardened_malloc.so'),
|
||||||
|
dirs_exist_ok=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Remove unneeded paths
|
# Remove unneeded paths
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue