Skip to content

Commit

Permalink
WAIT
Browse files Browse the repository at this point in the history
  • Loading branch information
jaysoleson committed Sep 26, 2024
1 parent 005baa1 commit d6885c5
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 81 deletions.
120 changes: 60 additions & 60 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Clangen.spec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exe = EXE(
a.scripts,
[],
exclude_binaries=True,
name='Pridegen',
name='Lifegen',
debug=False,
bootloader_ignore_signals=False,
strip=False,
Expand All @@ -56,11 +56,11 @@ coll = COLLECT(
strip=False,
upx=False,
upx_exclude=[],
name='Pridegen',
name='Lifegen',
)
app = BUNDLE(
coll,
name='Pridegen.app',
name='Lifegen.app',
icon='resources/images/icon.png',
bundle_identifier='com.sablesteel.clangen',
version='0.7.5' # imo we should give dev builds .5
Expand Down
4 changes: 2 additions & 2 deletions appdmg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "Pridegen",
"title": "Lifegen",
"background": "resources/images/mac_installer_bg_blank.png",
"icon-size": 75,
"window": {
Expand All @@ -10,6 +10,6 @@
},
"contents": [
{ "x": 204, "y": 200, "type": "link", "path": "/Applications" },
{ "x": 66, "y": 200, "type": "file", "path": "dist/Pridegen.app" }
{ "x": 66, "y": 200, "type": "file", "path": "dist/Lifegen.app" }
]
}
2 changes: 1 addition & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ def loading_animation():
if get_version_info().is_source_build or get_version_info().is_dev():
dev_watermark = pygame_gui.elements.UILabel(
scale(pygame.Rect((1050, 1321), (600, 100))),
"Pridegen: ",
"Lifegen: ",
object_id="#dev_watermark"
)

Expand Down
4 changes: 2 additions & 2 deletions scripts/housekeeping/datadir.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def get_data_dir():
from platformdirs import user_data_dir

if get_version_info().is_dev():
return user_data_dir('PrideGen', 'PrideGen')
return user_data_dir('PrideGen', 'PrideGen')
return user_data_dir('LifeGen', 'LifeGen')
return user_data_dir('LifeGen', 'LifeGen')


def get_log_dir():
Expand Down
22 changes: 11 additions & 11 deletions scripts/housekeeping/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def self_update(
update_channel: UpdateChannel = UpdateChannel.DEVELOPMENT_TEST,
progress_bar: UIUpdateProgressBar = None,
announce_restart_callback: callable = None):
print("Updating Pridegen...")
print("Updating Lifegen...")

platform_name = determine_platform_name()

Expand Down Expand Up @@ -199,7 +199,7 @@ def self_update(
with zipfile.ZipFile("download.tmp") as zip_ref:
zip_ref.extractall("Downloads")
os.remove("download.tmp")
shutil.copy("./Downloads/Pridegen/_internal/resources/self_updater.exe", "./Downloads/self_updater.exe")
shutil.copy("./Downloads/Lifegen/_internal/resources/self_updater.exe", "./Downloads/self_updater.exe")
announce_restart_callback()
time.sleep(3)
subprocess.Popen(
Expand All @@ -223,17 +223,17 @@ def self_update(
with tempfile.TemporaryDirectory() as mountdir:
progress_bar.advance()

os.system(f'hdiutil attach -nobrowse -mountpoint {mountdir} Downloads/Pridegen_macOS64.dmg')
os.system(f'hdiutil attach -nobrowse -mountpoint {mountdir} Downloads/Lifegen_macOS64.dmg')
progress_bar.advance()

shutil.rmtree('/Applications/Pridegen.app.old', ignore_errors=True)
shutil.rmtree('/Applications/Lifegen.app.old', ignore_errors=True)
progress_bar.advance()

if os.path.exists("/Applications/Pridegen.app"):
shutil.move('/Applications/Pridegen.app', '/Applications/Pridegen.app.old')
if os.path.exists("/Applications/Lifegen.app"):
shutil.move('/Applications/Lifegen.app', '/Applications/Lifegen.app.old')
progress_bar.advance()

shutil.copytree(f'{mountdir}/Pridegen.app', '/Applications/Pridegen.app')
shutil.copytree(f'{mountdir}/Lifegen.app', '/Applications/Lifegen.app')
progress_bar.advance()

shutil.rmtree("Downloads", ignore_errors=True)
Expand All @@ -246,17 +246,17 @@ def self_update(
progress_bar.advance()
announce_restart_callback()
time.sleep(3)
os.execv('/Applications/Pridegen.app/Contents/MacOS/Pridegen', sys.argv)
os.execv('/Applications/Lifegen.app/Contents/MacOS/Lifegen', sys.argv)
quit()

elif platform.system() == "Linux":
current_folder = os.getcwd()
with tarfile.open("download.tmp", "r") as tar_ref:
tar_ref.extractall("Downloads")
os.remove("download.tmp")
shutil.move("Downloads/Pridegen", "../pridegen_update")
shutil.move("Downloads/Lifegen", "../pridegen_update")
shutil.rmtree(current_folder, ignore_errors=True)
shutil.move("../pridegen_update", current_folder)
os.chmod(current_folder + "/Pridegen", 0o755)
os.execv(current_folder + "/Pridegen", sys.argv)
os.chmod(current_folder + "/Lifegen", 0o755)
os.execv(current_folder + "/Lifegen", sys.argv)
quit()
4 changes: 2 additions & 2 deletions self_updater/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn move_update_files_win() -> io::Result<()> {
}
}

let entries = fs::read_dir(game_path.join("Downloads").join("Pridegen"))?;
let entries = fs::read_dir(game_path.join("Downloads").join("Lifegen"))?;

println!("Applying updated files");
for entry in entries {
Expand All @@ -74,7 +74,7 @@ fn move_update_files_win() -> io::Result<()> {
Command::new("cmd.exe")
.raw_arg("/C")
.raw_arg("start")
.raw_arg("Pridegen.exe")
.raw_arg("Lifegen.exe")
.current_dir(game_path)
.creation_flags(0x00000008 | 0x01000000)
.spawn()?;
Expand Down

0 comments on commit d6885c5

Please sign in to comment.